Fixed issue #12597: Syntax highlighting not working - template editor

Dev: added a developement version of ace
LimeSurvey · Aug 25, 2017 · b2fa07d · b2fa07d
1 parent 7396ca5
commit b2fa07d
Show file tree

Hide file tree

Showing 1,070 changed files with 275,025 additions and 512 deletions.
diff --git a/application/config/third_party.php b/application/config/third_party.php
@@ -9,6 +9,8 @@
 $debug = isset($userConfig['config']['debug']) ? $userConfig['config']['debug'] : 0;
 /* To add more easily min version : config > 2 , seems really an core dev issue to fix bootstrap.js ;) */
 $minVersion = ($debug>0) ? "":".min";
+$minFolder = ($debug>0) ? "/dev":"/min";
+
 /* Please : comment the reason, mantis bug link: ajax don't need any package if i don't make error */
 /* Ajax must renderPartial (better : always return json) and never render and don't registerScript (IMHO) / Shnoulle on 2016-11-16 */
 if(isset($_GET['isAjax'])){
@@ -266,7 +268,7 @@
         'devBaseUrl' => 'third_party/ace',
         'basePath' => 'third_party.ace',
         'js' => array(
-            'ace.js'
+            $minFolder.'/ace.js'
         ),
         'depends' => array(
             'jquery-ace'

diff --git a/assets/packages/adminpanel/lib/surveysettings.js b/assets/packages/adminpanel/lib/surveysettings.js
@@ -39,72 +39,74 @@ $(document).on('ready  pjax:complete', function(){
   $('[data-copy]').each(function(){
     $(this).html($('#'+$(this).data('copy')).html());
   });
-
-  $.ajax({
-    url : jsonUrl,
-    dataType: 'json',
-    method: 'GET',
-    success: function(results){
-      // console.log(results);
-      var dataSet = [];
-      $.each(results.rows, function(i,row){
-        var rowArray = {
-          'id'                 : row.id,
-          'actionBtn'          : defineActions(row.datas),
-          'parameter'          : row.parameter,
-          'targetQuestionText' : row.question,
-          'sid'                : row.datas.sid,
-          'qid'                : row.datas.targetqid || '',
-          'sqid'               : row.datas.targetsqid || ''
-        };
-        dataSet.push(rowArray);
-      });
-
-      $('#urlparams').DataTable({
-        columns:[
-          {data: 'id', visible: false},
-          {data: 'actionBtn', label: sAction, orderable: false},
-          {data: 'parameter', label: sParameter},
-          {data: 'targetQuestionText', label: sTargetQuestion},
-          {data: 'sid', visible: false},
-          {data: 'qid', visible: false},
-          {data: 'sqid', visible: false}
-        ],
-        'language':{
-          'emptyTable':sNoParametersDefined,
-          'search':sSearchPrompt,
-          'infoEmpty':'',
-          'info':sProgress
-        }    
-        ,
-        data: dataSet,
-        createdRow: function(thisRow,data,dataIndex){
-          $(thisRow).data('rawdata',JSON.stringify(data));
-        },
-        rowId: 'id',
-        paging: false,
-        dom: '<\'#dt-toolbar\'>f<t>i'
-      });
-      var addParamButton = $('<button class="btn btn-success" id="addParameterButton">'+sAddParam+'</button>');
-      $('#dt-toolbar').addClass('pull-left clearfix').append(addParamButton)
-        .on('click', '#addParameterButton', function(e){
-          e.preventDefault();
-          newParameter(e);
+  var jsonUrl = jsonUrl || null;
+  if(jsonUrl !== null) {
+    $.ajax({
+      url : jsonUrl,
+      dataType: 'json',
+      method: 'GET',
+      success: function(results){
+        // console.log(results);
+        var dataSet = [];
+        $.each(results.rows, function(i,row){
+          var rowArray = {
+            'id'                 : row.id,
+            'actionBtn'          : defineActions(row.datas),
+            'parameter'          : row.parameter,
+            'targetQuestionText' : row.question,
+            'sid'                : row.datas.sid,
+            'qid'                : row.datas.targetqid || '',
+            'sqid'               : row.datas.targetsqid || ''
+          };
+          dataSet.push(rowArray);
         });
-      $('#urlparams').css('width','100%')
-        .on('click', '.surveysettings_edit_intparameter', function(e){
-          e.preventDefault();
-          // console.log(($(this).closest('tr').data('rawdata')));
-          editParameter(e,JSON.parse($(this).closest('tr').data('rawdata')));
-        })
-        .on('click', '.surveysettings_delete_intparameter', function(e){
-          e.preventDefault();
-          deleteParameter(e,JSON.parse($(this).closest('tr').data('rawdata')));
+
+        $('#urlparams').DataTable({
+          columns:[
+            {data: 'id', visible: false},
+            {data: 'actionBtn', label: sAction, orderable: false},
+            {data: 'parameter', label: sParameter},
+            {data: 'targetQuestionText', label: sTargetQuestion},
+            {data: 'sid', visible: false},
+            {data: 'qid', visible: false},
+            {data: 'sqid', visible: false}
+          ],
+          'language':{
+            'emptyTable':sNoParametersDefined,
+            'search':sSearchPrompt,
+            'infoEmpty':'',
+            'info':sProgress
+          },
+          data: dataSet,
+          createdRow: function(thisRow,data,dataIndex){$(thisRow).data('rawdata',JSON.stringify(data));},
+          rowId: 'id',
+          paging: false,
+          dom: '<\'#dt-toolbar\'>f<t>i'
         });
 
-    },
-    error: console.log
-  }   );
+        var addParamButton = $('<button class="btn btn-success" id="addParameterButton">'+sAddParam+'</button>');
+        $('#dt-toolbar').addClass('pull-left clearfix').append(addParamButton)
+          .on('click', '#addParameterButton', function(e){
+            e.preventDefault();
+            newParameter(e);
+          });
+        $('#urlparams').css('width','100%')
+          .on('click', '.surveysettings_edit_intparameter', function(e){
+            e.preventDefault();
+            // console.log(($(this).closest('tr').data('rawdata')));
+            editParameter(e,JSON.parse($(this).closest('tr').data('rawdata')));
+          })
+          .on('click', '.surveysettings_delete_intparameter', function(e){
+            e.preventDefault();
+            deleteParameter(e,JSON.parse($(this).closest('tr').data('rawdata')));
+          });
+
+      },
+      /* eslint-disable */
+      error: console.log
+      /* eslint-enable */
+    });
+  }
 
   $('#dlgEditParameter').dialog({
     autoOpen: false,

diff --git a/third_party/ace/_ace.js b/third_party/ace/_ace.js
diff --git a/third_party/ace/ace.js b/third_party/ace/ace.js