TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #950 from gpasztor87/master 

Emmet support for Codeeditor
This commit is contained in:
Samuel Georges 2015-02-21 15:05:44 +11:00
parent 1277364d4c 12bfc52941
commit 5b758e0d4c
5 changed files with 13797 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/backend/formwidgets/CodeEditor.php
View File

@ -128,7 +128,9 @@ class CodeEditor extends FormWidgetBase
public function loadAssets()
{
$this->addCss('css/codeeditor.css', 'core');
$this->addJs('vendor/emmet/emmet.js', 'core');
$this->addJs('vendor/ace/ace.js', 'core');
$this->addJs('vendor/ace/ext-emmet.js', 'core');
$this->addJs('js/codeeditor.js', 'core');
}
}

2
modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
View File

@ -46,6 +46,7 @@
useSoftTabs: true,
autoCloseTags: true,
showGutter: true,
enableEmmet: true,
language: 'php',
margin: 0,
vendorPath: '/',
@ -129,6 +130,7 @@
editor.renderer.setShowPrintMargin(options.showPrintMargin)
editor.setHighlightSelectedWord(options.highlightSelectedWord)
editor.renderer.setHScrollBarAlwaysVisible(options.hScrollBarAlwaysVisible)
editor.setOption('enableEmmet', options.enableEmmet)
editor.getSession().setUseSoftTabs(options.useSoftTabs)
editor.getSession().setTabSize(options.tabSize)
editor.setReadOnly(options.readOnly)

2
modules/backend/formwidgets/codeeditor/assets/vendor/ace/ext-emmet.js vendored
View File

@ -1141,7 +1141,7 @@ var onChangeMode = function(e, target) {
if (!editor)
return;
var modeId = editor.session.$modeId;
var enabled = modeId && /css|less|scss|sass|stylus|html|php/.test(modeId);
var enabled = modeId && /css|less|scss|sass|stylus|twig|html|php/.test(modeId);
if (e.enableEmmet === false)
enabled = false;
if (enabled)

13790
modules/backend/formwidgets/codeeditor/assets/vendor/emmet/emmet.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

2
modules/cms/controllers/Index.php
View File

@ -97,7 +97,9 @@ class Index extends Controller
// Preload Ace editor modes explicitly, because they could be changed dynamically
// depending on a content block type
$this->addJs('/modules/backend/formwidgets/codeeditor/assets/vendor/emmet/emmet.js', 'core');
$this->addJs('/modules/backend/formwidgets/codeeditor/assets/vendor/ace/ace.js', 'core');
$this->addJs('/modules/backend/formwidgets/codeeditor/assets/vendor/ace/ext-emmet.js', 'core');
$aceModes = ['markdown', 'plain_text', 'html', 'less', 'css', 'scss', 'sass', 'javascript'];
foreach ($aceModes as $mode) {