kallithea Changeset - 007d1a34a35a

Changeset - 007d1a34a35a

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 10 years ago 2015-11-17 02:42:07
madski@unity3d.com

edit: refactor cut'n'pasted code, working towards unifying it

4 files changed with 29 insertions and 27 deletions:

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/templates/admin/gists/edit.html

➞

Show inline comments

@@ @@ -76,75 +76,75 @@ @@
                     <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">
                     $(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 $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++) {
                                 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)}');
+                        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);
+                                }
+                            }
                         });
                         // 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);
+                            $mimetype_select.val(detected_mode.mime);
+                        }
                     });
                 </script>
             %endfor
             <div style="padding-top: 5px">
             ${h.submit('update',_('Update Gist'),class_="btn btn-mini btn-success")}
             <a class="btn btn-mini" href="${h.url('gist', gist_id=c.gist.gist_access_id)}">${_('Cancel')}</a>
             </div>
           ${h.end_form()}
           <script>

kallithea/templates/admin/gists/new.html

➞

Show inline comments

@@ @@ -54,62 +54,62 @@ @@
             </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">
             $(document).ready(function(){
                 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++) {
                         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');
+                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);
+                        }
+                    }
                 });
             });
           </script>
         </div>
     </div>
 </div>
 </%def>

kallithea/templates/files/files_add.html

➞

Show inline comments

@@ @@ -62,58 +62,59 @@ ${self.repo_context_bar('files')} @@
             </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">
                 $(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
                     $('#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++){
                             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;
+                            }
+                        }
                     });
                     $('#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);
+                            }
+                        }
                     });
                 });
             </script>
         </div>
     </div>
 </div>
 </%def>

kallithea/templates/files/files_edit.html

➞

Show inline comments

@@ @@ -69,44 +69,45 @@ ${self.repo_context_bar('files')} @@
             </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', "${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++){
                 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);
-            $($('#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);
             setCodeMirrorMode(myCodeMirror, detected_mode);
         });
     });
 </script>
 </%def>

0 comments (0 inline, 0 general)