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
2
2
kallithea/templates/admin/gists/edit.html
1
1
kallithea/templates/admin/gists/new.html
1
1
kallithea/templates/files/files_add.html
1
1
kallithea/templates/files/files_edit.html
1
1
0 comments (0 inline, 0 general)
kallithea/public/js/base.js
➞
Show inline comments
 
@@ -875,56 +875,56 @@ var fileBrowserListeners = function(curr
 
            }
 
            else{
 
                $('#tbody').show();
 
                $('#tbody_filtered').hide();
 
            }
 
        }
 
    };
 

			




	
	
	
		
 
    $('#filter_activate').click(function(){

			




	
	
	
		
 
            initFilter();

			




	
	
	
		
 
        });

			




	
	
	
		
 
    $node_filter.click(function(){

			




	
	
	
		
 
            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();

			




	
	
	
		
 
        });

			




	
	
	
		
 

			




	
	
	
		
 
    $('#upload_file_enable').click(function(){

			




	
	
	
		
 
            $('#editor_container').hide();

			




	
	
	
		
 
            $('#upload_file_container').show();

			




	
	
	
		
 
            $('#filename_container').hide();

			




	
	
	
		
 
            $('#set_mode_header').hide();

			




	
	
	
		
 
        });

			




	
	
	
		
 

			




	
	
	
		
 
    return myCodeMirror

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
var setCodeMirrorMode = function(codeMirrorInstance, mode) {

			




	
	
	
		
 
    CodeMirror.autoLoadMode(codeMirrorInstance, mode);

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/gists/edit.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -60,49 +60,49 @@

			




	
	
	
		
 
                     %if c.gist.gist_expires == -1:

			




	
	
	
		
 
                      ${_('Expires')}: ${_('Never')}

			




	
	
	
		
 
                     %else:

			




	
	
	
		
 
                      ${_('Expires')}: ${h.age(h.time_to_datetime(c.gist.gist_expires))}

			




	
	
	
		
 
                     %endif

			




	
	
	
		
 
                   </span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
            % for cnt, file in enumerate(c.files):

			




	
	
	
		
 
                <div id="body" class="codeblock" style="margin-bottom: 4px">

			




	
	
	
		
 
                    <div style="padding: 10px 10px 10px 26px;color:#666666">

			




	
	
	
		
 
                        <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

			




	
	
	
		
 
                            $(opt).prop('selected', true);

			




	
	
	
		
 
                            modes_select.options[0] = opt;

			




	
	
	
		
 
                        } else {

			




	
	
	
		
 
                            modes_select.options[index++] = opt;

			




	
	
	
		
 
                        }

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                });

			




	
	
	
		
 

			




	
	
	
		
 
                var $filename = $('#filename_${h.FID('f',file.path)}');

			




	
	
	
		
 
                // on select change set new mode

			




	
	
	
		
 
                $modes_select.change(function(e){

			




	
	
	
		
 
                    var selected = e.currentTarget;

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/gists/new.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -38,49 +38,49 @@

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <textarea style="resize:vertical; width:400px;border: 1px solid #ccc;border-radius: 3px;" id="description" name="description" placeholder="${_('Gist description ...')}"></textarea>

			




	
	
	
		
 
                <div style="padding:0px 0px 0px 42px">

			




	
	
	
		
 
                <label for='lifetime'>${_('Gist lifetime')}</label>

			




	
	
	
		
 
                ${h.select('lifetime', '', c.lifetime_options)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div id="body" class="codeblock">

			




	
	
	
		
 
                <div style="padding: 10px 10px 10px 26px;color:#666666">

			




	
	
	
		
 
                    ${h.text('filename', size=30, placeholder=_('name this file...'))}

			




	
	
	
		
 
                    <select id="mimetype" name="mimetype"/>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <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

			




	
	
	
		
 
                        $(opt).prop('selected', true);

			




	
	
	
		
 
                        modes_select.options[0] = opt;

			




	
	
	
		
 
                    } else {

			




	
	
	
		
 
                        modes_select.options[index++] = opt;

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                }

			




	
	
	
		
 
            });

			




	
	
	
		
 

			




	
	
	
		
 
            var $filename = $('#filename');

			




	
	
	
		
 
            // on select change set new mode

			




	
	
	
		
 
            $modes_select.change(function(e){

			




	
	
	
		
 
                var selected = e.currentTarget;

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_add.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -46,49 +46,49 @@ ${self.repo_context_bar('files')}

			




	
	
	
		
 
              <span id="upload_file_container" class="reviewer_ac" style="display:none">

			




	
	
	
		
 
                  <input type="file"  size="20" name="upload_file" id="upload_file">

			




	
	
	
		
 
                  ${_('or')} <div class="btn btn-small" id="file_enable">${_('Create New File')}</div>

			




	
	
	
		
 
              </span>

			




	
	
	
		
 
          </h3>

			




	
	
	
		
 
            <div id="body" class="codeblock">

			




	
	
	
		
 
            <div class="code-header" id="set_mode_header">

			




	
	
	
		
 
                <label class="commit" for="set_mode">${_('New file mode')}</label>

			




	
	
	
		
 
                <select id="set_mode" name="set_mode"/>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
                <div id="editor_container">

			




	
	
	
		
 
                    <pre id="editor_pre"></pre>

			




	
	
	
		
 
                    <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);

			




	
	
	
		
 
                        modes_select.options[0] = opt;

			




	
	
	
		
 
                    } else {

			




	
	
	
		
 
                        modes_select.options[index++] = opt;

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                }

			




	
	
	
		
 
            });

			




	
	
	
		
 
            $('#set_mode').change(function(e){

			




	
	
	
		
 
                var selected = e.currentTarget;

			




	
	
	
		
 
                var node = selected.options[selected.selectedIndex];

			




	
	
	
		
 
                var detected_mode = CodeMirror.findModeByMIME(node.value);

			




	
	
	
		
 
                setCodeMirrorMode(myCodeMirror, detected_mode);

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_edit.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -54,49 +54,49 @@ ${self.repo_context_bar('files')}

			




	
	
	
		
 
                       % endif

			




	
	
	
		
 
                      % endif

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <label class="commit" for="set_mode">${_('Editing file')}: ${c.file.unicode_path}</label>

			




	
	
	
		
 
                <select id="set_mode" name="set_mode"/>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
                <pre id="editor_pre"></pre>

			




	
	
	
		
 
                <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea>

			




	
	
	
		
 
                <div style="padding: 10px;color:#666666">${_('Commit Message')}</div>

			




	
	
	
		
 
                <textarea id="commit" name="message" style="height: 60px;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()}

			




	
	
	
		
 
        </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);

			




	
	
	
		
 
                modes_select.options[0] = opt;

			




	
	
	
		
 
            } else {

			




	
	
	
		
 
                modes_select.options[index++] = opt;

			




	
	
	
		
 
            }

			




	
	
	
		
 
        }

			




	
	
	
		
 
    });

			




	
	
	
		
 
    // try to detect the mode based on the file we edit

			




	
	
	
		
 
    var detected_mode = CodeMirror.findModeByExtension("${c.file.extension}");

			




	
	
	
		
 
    if(detected_mode){

			




	
	
	
		
 
        setCodeMirrorMode(myCodeMirror, detected_mode);

			




	
	
	
		
 
        $($('#set_mode option[value="'+detected_mode.mime+'"]')[0]).prop('selected', true);

			




	
	
	
		
 
    }

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-31083
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support