Mercurial > kallithea

changeset 5586:007d1a34a35a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
edit: refactor cut'n'pasted code, working towards unifying it
author Mads Kiilerich <madski@unity3d.com>
date Tue, 17 Nov 2015 02:42:07 +0100
parents e8922e1d92e5
children 87aef0cb5a6a
files kallithea/templates/admin/gists/edit.html kallithea/templates/admin/gists/new.html kallithea/templates/files/files_add.html kallithea/templates/files/files_edit.html
diffstat 4 files changed, 29 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/templates/admin/gists/edit.html	Tue Nov 17 02:42:01 2015 +0100
+++ b/kallithea/templates/admin/gists/edit.html	Tue Nov 17 02:42:07 2015 +0100
@@ -85,8 +85,8 @@
                         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 $mimetype_select = $('#mimetype_${h.FID('f',file.path)}');
+                        $mimetype_select.each(function(){
                             var modes_select = this;
                             var index = 1;
                             for(var i=0;i<CodeMirror.modeInfo.length;i++) {
@@ -103,29 +103,29 @@
                             }
                         });
 
-                        var $filename = $('#filename_${h.FID('f',file.path)}');
+                        var $filename_input = $('#filename_${h.FID('f',file.path)}');
                         // on select change set new mode
-                        $modes_select.change(function(e){
+                        $mimetype_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 file_data = CodeMirror.getFilenameAndExt($filename_input.val());
                             var filename = file_data['filename'] || 'filename1';
-                            $filename.val(filename + '.' + proposed_ext);
+                            $filename_input.val(filename + '.' + proposed_ext);
                         });
 
                         // on type the new filename set mode
-                        $filename.keyup(function(e){
+                        $filename_input.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);
+                                    $mimetype_select.val(detected_mode.mime);
                                 }
                             }
                         });
@@ -135,7 +135,7 @@
 
                         if (detected_mode){
                             setCodeMirrorMode(myCodeMirror, detected_mode);
-                            $modes_select.val(detected_mode.mime);
+                            $mimetype_select.val(detected_mode.mime);
                         }
                     });
                 </script>
--- a/kallithea/templates/admin/gists/new.html	Tue Nov 17 02:42:01 2015 +0100
+++ b/kallithea/templates/admin/gists/new.html	Tue Nov 17 02:42:07 2015 +0100
@@ -63,8 +63,8 @@
                 var myCodeMirror = initCodeMirror('editor', "${request.script_name}", '');
 
                 //inject new modes
-                var $modes_select = $('#mimetype');
-                $modes_select.each(function(){
+                var $mimetype_select = $('#mimetype');
+                $mimetype_select.each(function(){
                     var modes_select = this;
                     var index = 1;
                     for(var i=0;i<CodeMirror.modeInfo.length;i++) {
@@ -81,28 +81,28 @@
                     }
                 });
 
-                var $filename = $('#filename');
+                var $filename_input = $('#filename');
                 // on select change set new mode
-                $modes_select.change(function(e){
+                $mimetype_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 file_data = CodeMirror.getFilenameAndExt($filename_input.val());
                     var filename = file_data['filename'] || 'filename1';
-                    $filename.val(filename + '.' + proposed_ext);
+                    $filename_input.val(filename + '.' + proposed_ext);
                 });
 
                 // on type the new filename set mode
-                $filename.keyup(function(e){
+                $filename_input.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);
+                            $mimetype_select.val(detected_mode.mime);
                         }
                     }
                 });
--- a/kallithea/templates/files/files_add.html	Tue Nov 17 02:42:01 2015 +0100
+++ b/kallithea/templates/files/files_add.html	Tue Nov 17 02:42:07 2015 +0100
@@ -71,7 +71,8 @@
                     var myCodeMirror = initCodeMirror('editor', "${request.script_name}", reset_url);
 
                     //inject new modes, based on codeMirrors modeInfo object
-                    $('#mimetype').each(function(){
+                    var $mimetype_select = $('#mimetype');
+                    $mimetype_select.each(function(){
                         var modes_select = this;
                         var index = 1;
                         for(var i=0;i<CodeMirror.modeInfo.length;i++){
@@ -87,27 +88,27 @@
                             }
                         }
                     });
-                    $('#mimetype').change(function(e){
+                    var $filename_input = $('#filename');
+                    $mimetype_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 filenameInput = $('#filename');
                         var proposed_ext = CodeMirror.findExtensionByMode(detected_mode);
-                        var file_data = CodeMirror.getFilenameAndExt(filenameInput.val());
+                        var file_data = CodeMirror.getFilenameAndExt($filename_input.val());
                         var filename = file_data['filename'] || 'filename1';
-                        filenameInput.val(filename + '.' + proposed_ext);
+                        $filename_input.val(filename + '.' + proposed_ext);
                     });
 
                     // on type the new filename set mode
-                    $('#filename').keyup(function(e){
+                    $filename_input.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);
-                                $('#mimetype').val(detected_mode.mime);
+                                $mimetype_select.val(detected_mode.mime);
                             }
                         }
                     });
--- a/kallithea/templates/files/files_edit.html	Tue Nov 17 02:42:01 2015 +0100
+++ b/kallithea/templates/files/files_edit.html	Tue Nov 17 02:42:07 2015 +0100
@@ -78,7 +78,8 @@
         var myCodeMirror = initCodeMirror('editor', "${request.script_name}", reset_url);
 
        //inject new modes, based on codeMirrors modeInfo object
-        $('#mimetype').each(function(){
+        var $mimetype_select = $('#mimetype');
+        $mimetype_select.each(function(){
             var modes_select = this;
             var index = 1;
             for(var i=0;i<CodeMirror.modeInfo.length;i++){
@@ -98,10 +99,10 @@
         var detected_mode = CodeMirror.findModeByExtension("${c.file.extension}");
         if(detected_mode){
             setCodeMirrorMode(myCodeMirror, detected_mode);
-            $($('#mimetype option[value="'+detected_mode.mime+'"]')[0]).prop('selected', true);
+            $($mimetype_select.find('option[value="'+detected_mode.mime+'"]')[0]).prop('selected', true);
         }
 
-        $('#mimetype').on('change', function(e){
+        $mimetype_select.on('change', function(e){
             var selected = e.currentTarget;
             var node = selected.options[selected.selectedIndex];
             var detected_mode = CodeMirror.findModeByMIME(node.value);