kallithea Changeset - cf21a36ac3bb

Changeset - cf21a36ac3bb

Parent rev.

Child rev.

[Not reviewed]

stable

0 5 0

Christian Oyarzun - 10 years ago 2015-09-17 22:46:36
oyarzun@gmail.com

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

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

5 files changed with 6 insertions and 6 deletions:

kallithea/public/js/base.js

kallithea/templates/admin/gists/edit.html

kallithea/templates/admin/gists/new.html

kallithea/templates/files/files_add.html

kallithea/templates/files/files_edit.html

0 comments (0 inline, 0 general)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -887,32 +887,32 @@ var fileBrowserListeners = function(curr @@
             if($node_filter.hasClass('init')){
                 $node_filter.val('');
                 $node_filter.removeClass('init');
+            }
         });
     $node_filter.keyup(function(e){
             clearTimeout(filterTimeout);
             filterTimeout = setTimeout(updateFilter(e),600);
         });
 };
 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;
         });
     $('#file_enable').click(function(){
             $('#editor_container').show();
             $('#upload_file_container').hide();
             $('#filename_container').show();
             $('#set_mode_header').show();
         });

kallithea/templates/admin/gists/edit.html

➞

Show inline comments

@@ @@ -72,25 +72,25 @@ @@
                         <input type="hidden" value="${file.path}" name="org_files">
                         <input id="filename_${h.FID('f',file.path)}" name="files" size="30" type="text" value="${file.path}">
                         <select id="mimetype_${h.FID('f',file.path)}" name="mimetypes"/>
                     </div>
                     <div class="editor_container">
                         <pre id="editor_pre"></pre>
                         <textarea id="editor_${h.FID('f',file.path)}" name="contents" style="display:none">${file.content}</textarea>
                     </div>
                 </div>
                 ## 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)}');
                 $modes_select.each(function(){
                     var modes_select = this;
                     var index = 1;
                     for(var i=0;i<CodeMirror.modeInfo.length;i++) {
                         var m = CodeMirror.modeInfo[i];
                         var opt = new Option(m.name, m.mime);
                         $(opt).attr('mode', m.mode);
                         if (m.mime == 'text/plain') {
                             // default plain text

kallithea/templates/admin/gists/new.html

➞

Show inline comments

@@ @@ -50,25 +50,25 @@ @@
                 <div id="editor_container">
                     <pre id="editor_pre"></pre>
                     <textarea id="editor" name="content" style="display:none"></textarea>
                 </div>
             </div>
             <div style="padding-top: 5px">
             ${h.submit('private',_('Create Private Gist'),class_="btn btn-mini btn-success")}
             ${h.submit('public',_('Create Public Gist'),class_="btn btn-mini")}
             ${h.reset('reset',_('Reset'),class_="btn btn-mini")}
             </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');
             $modes_select.each(function(){
                 var modes_select = this;
                 var index = 1;
                 for(var i=0;i<CodeMirror.modeInfo.length;i++) {
                     var m = CodeMirror.modeInfo[i];
                     var opt = new Option(m.name, m.mime);
                     $(opt).attr('mode', m.mode);
                     if (m.mime == 'text/plain') {
                         // default plain text

kallithea/templates/files/files_add.html

➞

Show inline comments

@@ @@ -58,25 +58,25 @@ ${self.repo_context_bar('files')} @@
                     <textarea id="editor" name="content" style="display:none"></textarea>
                 </div>
                 <div style="padding: 10px;color:#666666">${_('Commit Message')}</div>
                 <textarea id="commit" name="message" style="height: 100px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea>
             </div>
             <div style="text-align: left;padding-top: 5px">
             ${h.submit('commit',_('Commit Changes'),class_="btn btn-small btn-success")}
             ${h.reset('reset',_('Reset'),class_="btn btn-small")}
             </div>
             ${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(){
                 var modes_select = this;
                 var index = 1;
                 for(var i=0;i<CodeMirror.modeInfo.length;i++){
                     var m = CodeMirror.modeInfo[i];
                     var opt = new Option(m.name, m.mime);
                     $(opt).attr('mode', m.mode);
                     if (m.mime == 'text/plain') {
                         // default plain text
                         $(opt).prop('selected', true);

kallithea/templates/files/files_edit.html

➞

Show inline comments

@@ @@ -66,25 +66,25 @@ ${self.repo_context_bar('files')} @@
             <div style="text-align: left;padding-top: 5px">
             ${h.submit('commit',_('Commit Changes'),class_="btn btn-small btn-success")}
             ${h.reset('reset',_('Reset'),class_="btn btn-small")}
             </div>
             ${h.end_form()}
         </div>
     </div>
 </div>
 <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(){
         var modes_select = this;
         var index = 1;
         for(var i=0;i<CodeMirror.modeInfo.length;i++){
             var m = CodeMirror.modeInfo[i];
             var opt = new Option(m.name, m.mime);
             $(opt).attr('mode', m.mode);
             if (m.mime == 'text/plain') {
                 // default plain text
                 $(opt).prop('selected', true);

0 comments (0 inline, 0 general)