Changeset - e8922e1d92e5
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Mads Kiilerich - 10 years ago 2015-11-17 02:42:01
madski@unity3d.com
files: rename the edit mime type field to mimetype as it is named in gists
3 files changed with 14 insertions and 14 deletions:
kallithea/public/js/base.js
2
2
kallithea/templates/files/files_add.html
7
7
kallithea/templates/files/files_edit.html
5
5
0 comments (0 inline, 0 general)
kallithea/public/js/base.js
➞
Show inline comments
 
@@ -911,20 +911,20 @@ var initCodeMirror = function(textarea_i
 
        });
 

			




	
	
	
		
 
    $('#file_enable').click(function(){

			




	
	
	
		
 
            $('#editor_container').show();

			




	
	
	
		
 
            $('#upload_file_container').hide();

			




	
	
	
		
 
            $('#filename_container').show();

			




	
	
	
		
 
            $('#set_mode_header').show();

			




	
	
	
		
 
            $('#mimetype_header').show();

			




	
	
	
		
 
        });

			




	
	
	
		
 

			




	
	
	
		
 
    $('#upload_file_enable').click(function(){

			




	
	
	
		
 
            $('#editor_container').hide();

			




	
	
	
		
 
            $('#upload_file_container').show();

			




	
	
	
		
 
            $('#filename_container').hide();

			




	
	
	
		
 
            $('#set_mode_header').hide();

			




	
	
	
		
 
            $('#mimetype_header').hide();

			




	
	
	
		
 
        });

			




	
	
	
		
 

			




	
	
	
		
 
    return myCodeMirror

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
var setCodeMirrorMode = function(codeMirrorInstance, mode) {

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_add.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -41,20 +41,20 @@ ${self.repo_context_bar('files')}

			




	
	
	
		
 
              <span id="filename_container" class="file reviewer_ac">

			




	
	
	
		
 
                  <input class="input-small" type="text" value="" size="30" name="filename" id="filename" placeholder="${_('Enter filename...')}">

			




	
	
	
		
 
                  <input type="hidden" value="${c.f_path}" size="30" name="location" id="location">

			




	
	
	
		
 
                  ${_('or')} <div class="btn btn-small" id="upload_file_enable">${_('Upload File')}</div>

			




	
	
	
		
 
              </span>

			




	
	
	
		
 
              <span id="upload_file_container" class="reviewer_ac" style="display:none">

			




	
	
	
		
 
                  <input type="file"  size="20" name="upload_file" id="upload_file">

			




	
	
	
		
 
                  <input type="file" size="20" name="upload_file" id="upload_file">

			




	
	
	
		
 
                  ${_('or')} <div class="btn btn-small" id="file_enable">${_('Create New File')}</div>

			




	
	
	
		
 
              </span>

			




	
	
	
		
 
          </h3>

			




	
	
	
		
 
            <div id="body" class="codeblock">

			




	
	
	
		
 
            <div class="code-header" id="set_mode_header">

			




	
	
	
		
 
                <label class="commit" for="set_mode">${_('New file mode')}</label>

			




	
	
	
		
 
                <select id="set_mode" name="set_mode"/>

			




	
	
	
		
 
            <div class="code-header" id="mimetype_header">

			




	
	
	
		
 
                <label class="commit" for="mimetype">${_('New file type')}</label>

			




	
	
	
		
 
                <select id="mimetype" name="mimetype"/>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
                <div id="editor_container">

			




	
	
	
		
 
                    <pre id="editor_pre"></pre>

			




	
	
	
		
 
                    <textarea id="editor" name="content" style="display:none"></textarea>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div style="padding: 10px;color:#666666">${_('Commit Message')}</div>

			




	
	
		
 
@@ -68,13 +68,13 @@ ${self.repo_context_bar('files')}

			




	
	
	
		
 
            <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(){

			




	
	
	
		
 
                    $('#mimetype').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);

			




	
	
		
 
@@ -84,13 +84,13 @@ ${self.repo_context_bar('files')}

			




	
	
	
		
 
                                modes_select.options[0] = opt;

			




	
	
	
		
 
                            } else {

			




	
	
	
		
 
                                modes_select.options[index++] = opt;

			




	
	
	
		
 
                            }

			




	
	
	
		
 
                        }

			




	
	
	
		
 
                    });

			




	
	
	
		
 
                    $('#set_mode').change(function(e){

			




	
	
	
		
 
                    $('#mimetype').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');

			




	
	
		
 
@@ -104,13 +104,13 @@ ${self.repo_context_bar('files')}

			




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

			




	
	
	
		
 
                                $('#mimetype').val(detected_mode.mime);

			




	
	
	
		
 
                            }

			




	
	
	
		
 
                        }

			




	
	
	
		
 
                    });

			




	
	
	
		
 
                });

			




	
	
	
		
 
            </script>

			




	
	
	
		
 
        </div>

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_edit.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -52,14 +52,14 @@ ${self.repo_context_bar('files')}

			




	
	
	
		
 
                       % if not c.file.is_binary:

			




	
	
	
		
 
                        ${h.link_to(_('Source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-mini")}

			




	
	
	
		
 
                       % endif

			




	
	
	
		
 
                      % endif

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <label class="commit" for="set_mode">${_('Editing file')}: ${c.file.unicode_path}</label>

			




	
	
	
		
 
                <select id="set_mode" name="set_mode"/>

			




	
	
	
		
 
                <label class="commit" for="mimetype">${_('Editing file')}: ${c.file.unicode_path}</label>

			




	
	
	
		
 
                <select id="mimetype" name="mimetype"/>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
                <pre id="editor_pre"></pre>

			




	
	
	
		
 
                <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea>

			




	
	
	
		
 
                <div style="padding: 10px;color:#666666">${_('Commit Message')}</div>

			




	
	
	
		
 
                <textarea id="commit" name="message" style="height: 60px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea>

			




	
	
	
		
 
            </div>

			




	
	
		
 
@@ -75,13 +75,13 @@ ${self.repo_context_bar('files')}

			




	
	
	
		
 
<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

			




	
	
	
		
 
        $('#set_mode').each(function(){

			




	
	
	
		
 
        $('#mimetype').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);

			




	
	
		
 
@@ -95,16 +95,16 @@ ${self.repo_context_bar('files')}

			




	
	
	
		
 
            }

			




	
	
	
		
 
        });

			




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

			




	
	
	
		
 
            $($('#mimetype option[value="'+detected_mode.mime+'"]')[0]).prop('selected', true);

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        $('#set_mode').on('change', function(e){

			




	
	
	
		
 
        $('#mimetype').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);

			




	
	
	
		
 
        });

			




	
	
	
		
 
    });

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.