Dev: updated ace editor, use twig highlighter

LimeSurvey · Jun 14, 2017 · 016f095 · 016f095
1 parent cf6675c
commit 016f095
Show file tree

Hide file tree

Showing 354 changed files with 437 additions and 118 deletions.
diff --git a/application/controllers/admin/templates.php b/application/controllers/admin/templates.php
@@ -719,6 +719,8 @@ protected function _templatesummary($templatename, $screenname, $editfile, $temp
             $sTemplateEditorMode = getGlobalSetting('templateeditormode', 'full');
         }
         $sExtension=substr(strrchr($editfile, '.'), 1);
+
+        // Select ACE editor mode
         switch ($sExtension)
         {
             case 'css':$sEditorFileType='css';
@@ -727,6 +729,8 @@ protected function _templatesummary($templatename, $screenname, $editfile, $temp
                 break;
             case 'js':$sEditorFileType='javascript';
                 break;
+            case 'twig':$sEditorFileType='twig';
+                break;
             default: $sEditorFileType='html';
                 break;
         }

diff --git a/application/helpers/admin/template_helper.php b/application/helpers/admin/template_helper.php
@@ -167,6 +167,7 @@ function gettemplatefilename($template, $templatefile) {
     switch (pathinfo($templatefile, PATHINFO_EXTENSION))
     {
         case 'twig':
+            // TODO: recursivity
             $oEditedTemplate = Template::model()->getTemplateConfiguration($template);
             return $oEditedTemplate->viewPath.$templatefile;
             break;

diff --git a/application/views/admin/templates/templatesummary_view.php b/application/views/admin/templates/templatesummary_view.php
@@ -1,5 +1,5 @@
 <?php
-Yii::app()->clientScript->registerScript('editorfiletype',"editorfiletype ='".$sEditorFileType."';",CClientScript::POS_HEAD); // Is this deprecated (2013-09-25) ?
+Yii::app()->clientScript->registerScript('editorfiletype',"editorfiletype ='".$sEditorFileType."';",CClientScript::POS_HEAD);
 ?>
 
 

diff --git a/third_party/ace/ace.js b/third_party/ace/ace.js
diff --git a/third_party/ace/ext-beautify.js b/third_party/ace/ext-beautify.js
diff --git a/third_party/ace/ext-chromevox.js b/third_party/ace/ext-chromevox.js
diff --git a/third_party/ace/ext-elastic_tabstops_lite.js b/third_party/ace/ext-elastic_tabstops_lite.js
diff --git a/third_party/ace/ext-emmet.js b/third_party/ace/ext-emmet.js
diff --git a/third_party/ace/ext-error_marker.js b/third_party/ace/ext-error_marker.js
@@ -0,0 +1,5 @@
+;
+                (function() {
+                    window.require(["ace/ext/error_marker"], function() {});
+                })();
+