# HG changeset patch
# User Christian Oyarzun <oyarzun@gmail.com>
# Date 2015-09-17 22:46:36
# Node ID cf21a36ac3bb5352f92a9738e81d8e7e0bcfd929
# Parent  8ee17ef217966a5aaf52ab33c42f47a490283456

codemirror: fix modeURL when using proxy prefix (Issue #160)

Modified by Mads to use request.script_name instead of h.url().

diff --git a/kallithea/public/js/base.js b/kallithea/public/js/base.js
--- a/kallithea/public/js/base.js
+++ b/kallithea/public/js/base.js
@@ -896,14 +896,14 @@ var fileBrowserListeners = function(curr
 };
 
 
-var initCodeMirror = function(textarea_id, resetUrl){
+var initCodeMirror = function(textarea_id, baseUrl, resetUrl){
     var myCodeMirror = CodeMirror.fromTextArea($('#' + textarea_id)[0], {
             mode: "null",
             lineNumbers: true,
             indentUnit: 4,
             autofocus: true
         });
-    CodeMirror.modeURL = "/codemirror/mode/%N/%N.js";
+    CodeMirror.modeURL = baseUrl + "/codemirror/mode/%N/%N.js";
 
     $('#reset').click(function(e){
             window.location=resetUrl;
diff --git a/kallithea/templates/admin/gists/edit.html b/kallithea/templates/admin/gists/edit.html
--- a/kallithea/templates/admin/gists/edit.html
+++ b/kallithea/templates/admin/gists/edit.html
@@ -81,7 +81,7 @@
 
                 ## dynamic edit box.
                 <script type="text/javascript">
-                var myCodeMirror = initCodeMirror("editor_${h.FID('f',file.path)}", '');
+                var myCodeMirror = initCodeMirror("editor_${h.FID('f',file.path)}", "${request.script_name}", '');
 
                 //inject new modes
                 var $modes_select = $('#mimetype_${h.FID('f',file.path)}');
diff --git a/kallithea/templates/admin/gists/new.html b/kallithea/templates/admin/gists/new.html
--- a/kallithea/templates/admin/gists/new.html
+++ b/kallithea/templates/admin/gists/new.html
@@ -59,7 +59,7 @@
             </div>
           ${h.end_form()}
           <script type="text/javascript">
-            var myCodeMirror = initCodeMirror('editor', '');
+            var myCodeMirror = initCodeMirror('editor', "${request.script_name}", '');
 
             //inject new modes
             var $modes_select = $('#mimetype');
diff --git a/kallithea/templates/files/files_add.html b/kallithea/templates/files/files_add.html
--- a/kallithea/templates/files/files_add.html
+++ b/kallithea/templates/files/files_add.html
@@ -67,7 +67,7 @@ ${self.repo_context_bar('files')}
             ${h.end_form()}
             <script type="text/javascript">
             var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path)}";
-            var myCodeMirror = initCodeMirror('editor',reset_url);
+            var myCodeMirror = initCodeMirror('editor', "${request.script_name}", reset_url);
 
             //inject new modes, based on codeMirrors modeInfo object
             $('#set_mode').each(function(){
diff --git a/kallithea/templates/files/files_edit.html b/kallithea/templates/files/files_edit.html
--- a/kallithea/templates/files/files_edit.html
+++ b/kallithea/templates/files/files_edit.html
@@ -75,7 +75,7 @@ ${self.repo_context_bar('files')}
 <script type="text/javascript">
 $(document).ready(function(){
     var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.file.path)}";
-    var myCodeMirror = initCodeMirror('editor',reset_url);
+    var myCodeMirror = initCodeMirror('editor', "${request.script_name}", reset_url);
 
    //inject new modes, based on codeMirrors modeInfo object
     $('#set_mode').each(function(){