Dev: [fix] html editor URL

LimeSurvey · Jun 21, 2015 · 1456edf · 1456edf · Shnoulle · Jun 21, 2015
1 parent 46fe201
commit 1456edf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/application/views/layouts/survey.php b/application/views/layouts/survey.php
@@ -13,14 +13,14 @@
             $cs->registerCssFile(App()->theme->baseUrl . '/css/style.css');
 
             $cs->registerCssFile(App()->params['bower-asset'] . '/select2-bootstrap-css/select2-bootstrap.min.css');
-            $cs->registerScriptFile('/scripts/ajax.js');
-        $cs->registerScriptFile('/scripts/unobtrusive.js');
+            $cs->registerScriptFile(App()->getBaseUrl().'/scripts/ajax.js');
+        $cs->registerScriptFile(App()->getBaseUrl().'/scripts/unobtrusive.js');
 
         $cs->registerScriptFile(App()->params['bower-asset'] . '/remarkable-bootstrap-notify/bootstrap-notify.min.js');
         $cs->registerScriptFile(App()->params['bower-asset'] . '/jquery-ui/jquery-ui.min.js');
         App()->getComponent('yiiwheels')->registerAssetJs('bootstrap-bootbox.min.js');
         $cs->registerScriptFile(App()->params['bower-asset'] . '/tinymce/tinymce.min.js');
-        $cs->registerScriptFile('/scripts/htmleditor.js');
+        $cs->registerScriptFile(App()->getBaseUrl().'/scripts/htmleditor.js');
         $cs->registerScript('links', "$('body').on('click', '.disabled a', function (e) { e.preventDefault(); });");
         ?>
         <title>Limesurvey Administration</title>
@@ -52,4 +52,4 @@
 
     </body>
 
-</html>
+</html>
diff --git a/scripts/htmleditor.js b/scripts/htmleditor.js
@@ -4,7 +4,7 @@
         'selector' :'textarea.html',
         'file_picker_callback' : function(callback, value, meta) {
             tinymce.activeEditor.windowManager.open({
-                file: '/index.php?r=files/manage&dialog=1',
+                file: LS.data.baseUrl+'/index.php?r=files/manage&dialog=1',
                 title: 'elFinder',
                 width: 900,
                 height: 480,
@@ -38,7 +38,7 @@
 
 function elFinderBrowser (field_name, url, type, win) {
     tinymce.activeEditor.windowManager.open({
-        file: '/elfinder/elfinder.html',// use an absolute path!
+        file: LS.data.baseUrl+'/elfinder/elfinder.html',// use an absolute path!
         title: 'elFinder 2.0',
         width: 900,
         height: 450,
@@ -49,4 +49,4 @@ function elFinderBrowser (field_name, url, type, win) {
         }
     });
     return false;
-}
+}