Changeset - ccc005b96103
[Not reviewed]
default
1 7 0
Christian Oyarzun - 11 years ago 2014-11-13 16:56:28
oyarzun@gmail.com
javascript: added missing helper functions to make templates using codemirror work properly. (Issue #11)
* * *
imported patch codemirror-whitespacecleanup
8 files changed with 124 insertions and 304 deletions:
0 comments (0 inline, 0 general)
kallithea/public/js/base.js
Show inline comments
 
@@ -990,6 +990,8 @@ var initCodeMirror = function(textarea_i
 
            indentUnit: 4,
 
            autofocus: true
 
        });
 
    CodeMirror.modeURL = "/codemirror/mode/%N/%N.js";
 

	
 
    $('#reset').click(function(e){
 
            window.location=resetUrl;
 
        });
 
@@ -1012,7 +1014,6 @@ var initCodeMirror = function(textarea_i
 
};
 

	
 
var setCodeMirrorMode = function(codeMirrorInstance, mode) {
 
    codeMirrorInstance.setOption("mode", mode);
 
    CodeMirror.autoLoadMode(codeMirrorInstance, mode);
 
}
 

	
kallithea/public/js/codemirror_loadmode.js
Show inline comments
 
@@ -22,7 +22,7 @@
 
  }
 

	
 
  CodeMirror.requireMode = function(mode, cont) {
 
    if (typeof mode != "string") mode = mode.name;
 
    if (typeof mode != "string") mode = mode.mode;
 
    if (CodeMirror.modes.hasOwnProperty(mode)) return ensureDeps(mode, cont);
 
    if (loading.hasOwnProperty(mode)) return loading[mode].push(cont);
 

	
 
@@ -48,7 +48,29 @@
 
      CodeMirror.requireMode(mode, function() {
 
        instance.setOption("mode", instance.getOption("mode"));
 
      });
 
    instance.setOption("mode", mode.mime);
 
  };
 

	
 
  CodeMirror.findExtensionByMode = function(modeInfo) {
 
    if (modeInfo.ext) {
 
      return modeInfo.ext[0];
 
    } else if (modeInfo.mode) {
 
      return modeInfo.mode;
 
    } else {
 
      return "txt";
 
    }
 
  };
 

	
 
  CodeMirror.getFilenameAndExt = function(filename){
 
    var parts = filename.split('.');
 

	
 
    if (parts.length > 1){
 
        var ext = parts.pop();
 
        var filename = parts.join("");
 
    }
 
    return {"filename": filename, "ext": ext};
 
  };
 

	
 
}());
 

	
 

	
kallithea/public/js/meta_ext.js
Show inline comments
 
deleted file
kallithea/templates/admin/gists/edit.html
Show inline comments
 
@@ -12,7 +12,6 @@
 
<script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>
 
<script type="text/javascript" src="${h.url('/js/codemirror_loadmode.js')}"></script>
 
<script type="text/javascript" src="${h.url('/codemirror/mode/meta.js')}"></script>
 
<script type="text/javascript" src="${h.url('/js/meta_ext.js')}"></script>
 
</%def>
 
<%def name="css_extra()">
 
<link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>
 
@@ -75,10 +74,7 @@
 
                    <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">
 
                            <option selected="selected" value="plain">${_('plain')}</option>
 
                        </select>
 
                        <select id="mimetype_${h.FID('f',file.path)}" name="mimetypes"/>
 
                    </div>
 
                    <div class="editor_container">
 
                        <pre id="editor_pre"></pre>
 
@@ -89,17 +85,23 @@
 
                ## dynamic edit box.
 
                <script type="text/javascript">
 
                var myCodeMirror = initCodeMirror("editor_${h.FID('f',file.path)}", '');
 
                CodeMirror.modeURL = "${h.url('/codemirror/mode/%N/%N.js')}";
 

	
 
                //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);
 
                        modes_select.options[i+1] = opt;
 
                        if (m.mime == 'text/plain') {
 
                            // default plain text
 
                            $(opt).attr('selected', 'selected');
 
                            modes_select.options[0] = opt;
 
                        } else {
 
                            modes_select.options[index++] = opt;
 
                        }
 
                    }
 
                });
 

	
 
@@ -108,38 +110,34 @@
 
                $modes_select.change(function(e){
 
                    var selected = e.currentTarget;
 
                    var node = selected.options[selected.selectedIndex];
 
                    var mimetype = node.value;
 
                    var new_mode = $(node).attr('mode');
 
                    setCodeMirrorMode(myCodeMirror, new_mode);
 
                    var detected_mode = CodeMirror.findModeByMIME(node.value);
 
                    setCodeMirrorMode(myCodeMirror, detected_mode);
 

	
 
                    var proposed_ext = getExtFromMimeType(mimetype);
 
                    var file_data = getFilenameAndExt($filename.val());
 
                    var proposed_ext = CodeMirror.findExtensionByMode(detected_mode);
 
                    var file_data = CodeMirror.getFilenameAndExt($filename.val());
 
                    var filename = file_data['filename'] || 'filename1';
 
                    $(filename_selector).val(filename + proposed_ext);
 
                })
 
                    $filename.val(filename + '.' + proposed_ext);
 
                });
 

	
 
                // on type the new filename set mode
 
                $filename.keyup(function(e){
 
                    var file_data = getFilenameAndExt(this.value);
 
                    var file_data = CodeMirror.getFilenameAndExt(this.value);
 
                    if(file_data['ext'] != null){
 

	
 
                        var mimetype = getMimeTypeFromExt(file_data['ext']);
 
                        var detected_mode = detectCodeMirrorMode(this.value, mimetype);
 
                        var detected_mode = CodeMirror.findModeByExtension(file_data['ext']) || CodeMirror.findModeByMIME('text/plain');
 

	
 
                        if (detected_mode){
 
                            setCodeMirrorMode(myCodeMirror, detected_mode);
 
                            $modes_select.val(mimetype)
 
                            $modes_select.val(detected_mode.mime);
 
                        }
 
                    }
 
                })
 
                });
 

	
 
                // set mode on page load
 
                var mimetype = getMimeTypeFromExt("${file.extension}");
 
                var detected_mode = detectCodeMirrorMode("${file.path}", mimetype);
 
                var detected_mode = CodeMirror.findModeByExtension("${file.extension}");
 

	
 
                if (detected_mode){
 
                    setCodeMirrorMode(myCodeMirror, detected_mode);
 
                    modes_select.val(mimetype)
 
                    $modes_select.val(detected_mode.mime);
 
                }
 

	
 
                </script>
 
@@ -170,7 +168,7 @@
 
                      }
 
                    }
 
                  })
 
              })
 
              });
 
          </script>
 
        </div>
 
    </div>
kallithea/templates/admin/gists/new.html
Show inline comments
 
@@ -12,7 +12,6 @@
 
<script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>
 
<script type="text/javascript" src="${h.url('/js/codemirror_loadmode.js')}"></script>
 
<script type="text/javascript" src="${h.url('/codemirror/mode/meta.js')}"></script>
 
<script type="text/javascript" src="${h.url('/js/meta_ext.js')}"></script>
 
</%def>
 
<%def name="css_extra()">
 
<link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>
 
@@ -49,7 +48,7 @@
 
            <div id="body" class="codeblock">
 
                <div style="padding: 10px 10px 10px 26px;color:#666666">
 
                    ${h.text('filename', size=30, placeholder=_('name this file...'))}
 
                    ${h.select('mimetype','plain',[('plain',_('plain'))])}
 
                    <select id="mimetype" name="mimetype"/>
 
                </div>
 
                <div id="editor_container">
 
                    <pre id="editor_pre"></pre>
 
@@ -64,17 +63,23 @@
 
            ${h.end_form()}
 
            <script type="text/javascript">
 
            var myCodeMirror = initCodeMirror('editor', '');
 
            CodeMirror.modeURL = "${h.url('/codemirror/mode/%N/%N.js')}";
 

	
 
            //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);
 
                    modes_select.options[i+1] = opt;
 
                    if (m.mime == 'text/plain') {
 
                        // default plain text
 
                        $(opt).attr('selected', 'selected');
 
                        modes_select.options[0] = opt;
 
                    } else {
 
                        modes_select.options[index++] = opt;
 
                    }
 
                }
 
            });
 

	
 
@@ -83,28 +88,26 @@
 
            $modes_select.change(function(e){
 
                var selected = e.currentTarget;
 
                var node = selected.options[selected.selectedIndex];
 
                var mimetype = node.value;
 
                var new_mode = $(node).attr('mode');
 
                setCodeMirrorMode(myCodeMirror, new_mode);
 
                var detected_mode = CodeMirror.findModeByMIME(node.value);
 
                setCodeMirrorMode(myCodeMirror, detected_mode);
 

	
 
                var proposed_ext = getExtFromMimeType(mimetype);
 
                var file_data = getFilenameAndExt($filename.val());
 
                var proposed_ext = CodeMirror.findExtensionByMode(detected_mode);
 
                var file_data = CodeMirror.getFilenameAndExt($filename.val());
 
                var filename = file_data['filename'] || 'filename1';
 
                $filename.val(filename + proposed_ext);
 
                $filename.val(filename + '.' + proposed_ext);
 
            });
 

	
 
            // on type the new filename set mode
 
            $filename.keyup(function(e){
 
                var file_data = getFilenameAndExt(this.value);
 
                var file_data = CodeMirror.getFilenameAndExt(this.value);
 
                if(file_data['ext'] != null){
 
                    var mimetype = getMimeTypeFromExt(file_data['ext']);
 
                    var detected_mode = detectCodeMirrorMode(this.value, mimetype);
 
                    var detected_mode = CodeMirror.findModeByExtension(file_data['ext']) || CodeMirror.findModeByMIME('text/plain');
 
                    if (detected_mode){
 
                        setCodeMirrorMode(myCodeMirror, detected_mode);
 
                        $modes_select.val(mimetype)
 
                        $modes_select.val(detected_mode.mime);
 
                    }
 
                }
 
            })
 
            });
 
            </script>
 
        </div>
 
    </div>
kallithea/templates/files/files_add.html
Show inline comments
 
@@ -11,7 +11,6 @@
 
<script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>
 
<script type="text/javascript" src="${h.url('/js/codemirror_loadmode.js')}"></script>
 
<script type="text/javascript" src="${h.url('/codemirror/mode/meta.js')}"></script>
 
<script type="text/javascript" src="${h.url('/js/meta_ext.js')}"></script>
 
</%def>
 
<%def name="css_extra()">
 
<link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>
 
@@ -55,7 +54,7 @@ ${self.repo_context_bar('files')}
 
            <div id="body" class="codeblock">
 
            <div class="code-header" id="set_mode_header">
 
                <label class="commit" for="set_mode">${_('New file mode')}</label>
 
                ${h.select('set_mode','plain',[('plain',_('plain'))])}
 
                <select id="set_mode" name="set_mode"/>
 
            </div>
 
                <div id="editor_container">
 
                    <pre id="editor_pre"></pre>
 
@@ -72,21 +71,47 @@ ${self.repo_context_bar('files')}
 
            <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);
 
            CodeMirror.modeURL = "${h.url('/codemirror/mode/%N/%N.js')}";
 

	
 
            //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.mode);
 
                    modes_select.options[i+1] = opt
 
                    var opt = new Option(m.name, m.mime);
 
                    $(opt).attr('mode', m.mode);
 
                    if (m.mime == 'text/plain') {
 
                        // default plain text
 
                        $(opt).attr('selected', 'selected');
 
                        modes_select.options[0] = opt;
 
                    } else {
 
                        modes_select.options[index++] = opt;
 
                    }
 
                }
 
            });
 
            $('#set_mode').change(function(e){
 
                var selected = e.currentTarget;
 
                var new_mode = selected.options[selected.selectedIndex].value;
 
                setCodeMirrorMode(myCodeMirror, new_mode);
 
                var node = selected.options[selected.selectedIndex];
 
                var detected_mode = CodeMirror.findModeByMIME(node.value);
 
                setCodeMirrorMode(myCodeMirror, detected_mode);
 

	
 
                var filenameInput = $('#filename');
 
                var proposed_ext = CodeMirror.findExtensionByMode(detected_mode);
 
                var file_data = CodeMirror.getFilenameAndExt(filenameInput.val());
 
                var filename = file_data['filename'] || 'filename1';
 
                filenameInput.val(filename + '.' + proposed_ext);
 
            });
 

	
 
            // on type the new filename set mode
 
            $('#filename').keyup(function(e){
 
                var file_data = CodeMirror.getFilenameAndExt(this.value);
 
                if(file_data['ext'] != null){
 
                    var detected_mode = CodeMirror.findModeByExtension(file_data['ext']) || CodeMirror.findModeByMIME('text/plain');
 
                    if (detected_mode){
 
                        setCodeMirrorMode(myCodeMirror, detected_mode);
 
                        $('#set_mode').val(detected_mode.mime);
 
                    }
 
                }
 
            });
 
            </script>
 
        </div>
kallithea/templates/files/files_delete.html
Show inline comments
 
@@ -7,16 +7,6 @@
 
    %endif
 
</%def>
 

	
 
<%def name="js_extra()">
 
<script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>
 
<script type="text/javascript" src="${h.url('/js/codemirror_loadmode.js')}"></script>
 
<script type="text/javascript" src="${h.url('/codemirror/mode/meta.js')}"></script>
 
<script type="text/javascript" src="${h.url('/js/meta_ext.js')}"></script>
 
</%def>
 
<%def name="css_extra()">
 
<link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>
 
</%def>
 

	
 
<%def name="page_nav()">
 
    ${self.menu('repositories')}
 
</%def>
kallithea/templates/files/files_edit.html
Show inline comments
 
@@ -11,7 +11,6 @@
 
<script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>
 
<script type="text/javascript" src="${h.url('/js/codemirror_loadmode.js')}"></script>
 
<script type="text/javascript" src="${h.url('/codemirror/mode/meta.js')}"></script>
 
<script type="text/javascript" src="${h.url('/js/meta_ext.js')}"></script>
 
</%def>
 
<%def name="css_extra()">
 
<link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/>
 
@@ -60,7 +59,7 @@ ${self.repo_context_bar('files')}
 
                    </div>
 
                </div>
 
                <label class="commit" for="set_mode">${_('Editing file')}: ${c.file.unicode_path}</label>
 
                ${h.select('set_mode','plain',[('plain',_('plain'))])}
 
                <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>
 
@@ -80,28 +79,37 @@ ${self.repo_context_bar('files')}
 
$(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);
 
    CodeMirror.modeURL = "${h.url('/codemirror/mode/%N/%N.js')}";
 

	
 
   //inject new modes, based on codeMirrors modeInfo object
 
    var modes_select = $('#set_mode');
 
    for(var i=0;i<CodeMirror.modeInfo.length;i++){
 
        var m = CodeMirror.modeInfo[i];
 
        var opt = $('<option></option>').val(m.mode).text(m.name)
 
        modes_select.append(opt)
 
    $('#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).attr('selected', 'selected');
 
                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]).attr("selected", "selected")
 
    }
 

	
 
    // try to detect the mode based on the file we edit
 
    var detected_mode = detectCodeMirrorMode("${c.file.name}", "${c.file.mimetype}")
 
    if(detected_mode){
 
    $('#set_mode').on('change', function(e){
 
        var selected = e.currentTarget;
 
        var node = selected.options[selected.selectedIndex];
 
        var detected_mode = CodeMirror.findModeByMIME(node.value);
 
        setCodeMirrorMode(myCodeMirror, detected_mode);
 
        $($('#set_mode option[value="'+detected_mode+'"]')[0]).attr("selected", "selected")
 
    }
 

	
 
    $(modes_select).on('change', function(e){
 
        var selected = e.currentTarget;
 
        var new_mode = selected.options[selected.selectedIndex].value;
 
        setCodeMirrorMode(myCodeMirror, new_mode);
 
    })
 
    });
 
})
 
</script>
 
</%def>
0 comments (0 inline, 0 general)