Changeset - ef70f1594acf
[Not reviewed]
default
0 4 0
Mads Kiilerich - 10 years ago 2015-11-17 02:31:01
madski@unity3d.com
edit: fix indentation and document ready execution of javascript for file and gist editing
4 files changed with 163 insertions and 158 deletions:
0 comments (0 inline, 0 general)
kallithea/templates/admin/gists/edit.html
Show inline comments
 
@@ -81,62 +81,63 @@
 

	
 
                ## dynamic edit box.
 
                <script type="text/javascript">
 
                var myCodeMirror = initCodeMirror("editor_${h.FID('f',file.path)}", "${request.script_name}", '');
 
                    $(document).ready(function(){
 
                        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;
 
                                }
 
                            }
 
                        });
 

	
 
                //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;
 
                            var node = selected.options[selected.selectedIndex];
 
                            var detected_mode = CodeMirror.findModeByMIME(node.value);
 
                            setCodeMirrorMode(myCodeMirror, detected_mode);
 

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

	
 
                var $filename = $('#filename_${h.FID('f',file.path)}');
 
                // on select change set new mode
 
                $modes_select.change(function(e){
 
                    var selected = e.currentTarget;
 
                    var node = selected.options[selected.selectedIndex];
 
                    var detected_mode = CodeMirror.findModeByMIME(node.value);
 
                    setCodeMirrorMode(myCodeMirror, detected_mode);
 
                        // 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');
 

	
 
                    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);
 
                });
 
                                if (detected_mode){
 
                                    setCodeMirrorMode(myCodeMirror, detected_mode);
 
                                    $modes_select.val(detected_mode.mime);
 
                                }
 
                            }
 
                        });
 

	
 
                // 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');
 
                        // set mode on page load
 
                        var detected_mode = CodeMirror.findModeByExtension("${file.extension}");
 

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

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

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

	
 
                    });
 
                </script>
 

	
 
            %endfor
kallithea/templates/admin/gists/new.html
Show inline comments
 
@@ -59,51 +59,53 @@
 
            </div>
 
          ${h.end_form()}
 
          <script type="text/javascript">
 
            var myCodeMirror = initCodeMirror('editor', "${request.script_name}", '');
 
            $(document).ready(function(){
 
                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;
 
                //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;
 
                var node = selected.options[selected.selectedIndex];
 
                var detected_mode = CodeMirror.findModeByMIME(node.value);
 
                setCodeMirrorMode(myCodeMirror, detected_mode);
 
                var $filename = $('#filename');
 
                // on select change set new mode
 
                $modes_select.change(function(e){
 
                    var selected = e.currentTarget;
 
                    var node = selected.options[selected.selectedIndex];
 
                    var detected_mode = CodeMirror.findModeByMIME(node.value);
 
                    setCodeMirrorMode(myCodeMirror, detected_mode);
 

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

	
 
            // 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);
 
                        $modes_select.val(detected_mode.mime);
 
                // 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);
 
                            $modes_select.val(detected_mode.mime);
 
                        }
 
                    }
 
                }
 
                });
 
            });
 
          </script>
 
        </div>
kallithea/templates/files/files_add.html
Show inline comments
 
@@ -66,50 +66,52 @@ ${self.repo_context_bar('files')}
 
            </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', "${request.script_name}", reset_url);
 
                $(document).ready(function(){
 
                    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', "${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);
 
                    //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);
 

	
 
                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);
 
            });
 
                        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);
 
                    }
 
                }
 
            });
 
                    // 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>
 
    </div>
kallithea/templates/files/files_edit.html
Show inline comments
 
@@ -73,40 +73,40 @@ ${self.repo_context_bar('files')}
 
</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', "${request.script_name}", reset_url);
 
    $(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', "${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;
 
       //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);
 
        }
 

	
 
        $('#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);
 
        });
 
    });
 
    // 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);
 
    }
 

	
 
    $('#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);
 
    });
 
});
 
</script>
 
</%def>
0 comments (0 inline, 0 general)