kallithea Changeset - ef70f1594acf

Changeset - ef70f1594acf

Parent rev.

Child rev.

[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

3 files changed with 6 insertions and 1 deletions:

kallithea/templates/admin/gists/edit.html

kallithea/templates/admin/gists/new.html

kallithea/templates/files/files_add.html

0 comments (0 inline, 0 general)

kallithea/templates/admin/gists/edit.html

➞

Show inline comments

@@ @@ -72,24 +72,25 @@ @@
                         <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">
                     $(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') {
@@ @@ -127,25 +128,25 @@ @@
                             $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
             <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>
               $('#update').on('click', function(e){
                   e.preventDefault();

kallithea/templates/admin/gists/new.html

➞

Show inline comments

@@ @@ -50,24 +50,25 @@ @@
                 <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">
             $(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') {
@@ @@ -96,18 +97,19 @@ @@
             // 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>
     </div>
 </div>
 </%def>

kallithea/templates/files/files_add.html

➞

Show inline comments

@@ @@ -57,24 +57,25 @@ ${self.repo_context_bar('files')} @@
                     <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">
                 $(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') {
@@ @@ -101,17 +102,18 @@ ${self.repo_context_bar('files')} @@
             // 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>
 </div>
 </%def>

0 comments (0 inline, 0 general)