Changeset - 42c1a1c7ffdd
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich - 10 years ago 2015-08-05 12:29:41
madski@unity3d.com
comments: cleanup of full_f_path - just put data attribute on div around diff of each file
2 files changed with 3 insertions and 6 deletions:
kallithea/public/js/base.js
1
2
kallithea/templates/changeset/diff_block.html
2
4
0 comments (0 inline, 0 general)
kallithea/public/js/base.js
➞
Show inline comments
 
@@ -633,50 +633,49 @@ var _createInlineForm = function(parent_
 
        }
 
        $(newtr).remove();
 
        $(parent_tr).removeClass('form-open');
 
        $(parent_tr).removeClass('hl-comment');
 
    });
 

			




	
	
	
		
 
    return $form

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Inject inline comment for an given TR. This tr should always be a .line .

			




	
	
	
		
 
 * The form will be inject after any comments.

			




	
	
	
		
 
 */

			




	
	
	
		
 
var injectInlineForm = function(tr){

			




	
	
	
		
 
    var $tr = $(tr);

			




	
	
	
		
 
    if(!$tr.hasClass('line')){

			




	
	
	
		
 
        return

			




	
	
	
		
 
    }

			




	
	
	
		
 
    var submit_url = AJAX_COMMENT_URL;

			




	
	
	
		
 
    var $td = $tr.find('.code');

			




	
	
	
		
 
    if($tr.hasClass('form-open') || $tr.hasClass('context') || $td.hasClass('no-comment')){

			




	
	
	
		
 
        return

			




	
	
	
		
 
    }

			




	
	
	
		
 
    $tr.addClass('form-open hl-comment');

			




	
	
	
		
 
    var $node = $tr.parent().parent().parent().find('.full_f_path');

			




	
	
	
		
 
    var f_path = $node.attr('path');

			




	
	
	
		
 
    var f_path = $tr.parent().closest('.full_f_path').data('f_path');

			




	
	
	
		
 
    var lineno = _getLineNo(tr);

			




	
	
	
		
 
    var $form = _createInlineForm(tr, f_path, lineno, submit_url);

			




	
	
	
		
 

			




	
	
	
		
 
    var $parent = $tr;

			




	
	
	
		
 
    while ($parent.next().hasClass('inline-comments')){

			




	
	
	
		
 
        var $parent = $parent.next();

			




	
	
	
		
 
    }

			




	
	
	
		
 
    $form.insertAfter($parent);

			




	
	
	
		
 
    var $overlay = $form.find('.submitting-overlay');

			




	
	
	
		
 
    var $inlineform = $form.find('.inline-form');

			




	
	
	
		
 

			




	
	
	
		
 
    $form.submit(function(e){

			




	
	
	
		
 
        e.preventDefault();

			




	
	
	
		
 

			




	
	
	
		
 
        if(lineno === undefined){

			




	
	
	
		
 
            alert('Error submitting, line ' + lineno + ' not found.');

			




	
	
	
		
 
            return;

			




	
	
	
		
 
        }

			




	
	
	
		
 
        if(f_path === undefined){

			




	
	
	
		
 
            alert('Error submitting, file path ' + f_path + ' not found.');

			




	
	
	
		
 
            return;

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        var text = $('#text_'+lineno).val();

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/diff_block.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -20,50 +20,49 @@

			




	
	
	
		
 
                <div class="diff-actions">

			




	
	
	
		
 
                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full diff for this file')}">

			




	
	
	
		
 
                      <i class="icon-file-code"></i>

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                  <a href="${h.url('files_diff_2way_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full side-by-side diff for this file')}">

			




	
	
	
		
 
                      <i class="icon-docs"></i>

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='raw')}" class="tooltip" title="${_('Raw diff')}">

			




	
	
	
		
 
                      <i class="icon-diff"></i>

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='download')}" class="tooltip" title="${_('Download diff')}">

			




	
	
	
		
 
                      <i class="icon-floppy"></i>

			




	
	
	
		
 
                  </a>

			




	
	
	
		
 
                  ${c.ignorews_url(request.GET, h.FID(cs2,path))}

			




	
	
	
		
 
                  ${c.context_url(request.GET, h.FID(cs2,path))}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <span style="float:right;margin-top:-3px">

			




	
	
	
		
 
                  <label>

			




	
	
	
		
 
                  ${_('Show inline comments')}

			




	
	
	
		
 
                  ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=h.FID(cs2,path))}

			




	
	
	
		
 
                  </label>

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="code-body">

			




	
	
	
		
 
            <div class="full_f_path" path="${h.safe_unicode(path)}"></div>

			




	
	
	
		
 
        <div class="code-body full_f_path" data-f_path="${h.safe_unicode(path)}">

			




	
	
	
		
 
            ${diff|n}

			




	
	
	
		
 
            %if path.rsplit('.')[-1] in ['png', 'gif', 'jpg', 'bmp']:

			




	
	
	
		
 
              <div class="btn btn-image-diff-show">Show images</div>

			




	
	
	
		
 
              %if change =='M':

			




	
	
	
		
 
                <div id="${FID}_image-diff" class="btn btn-image-diff-swap" style="display:none">Press to swap images</div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              <div style="font-size: 0">

			




	
	
	
		
 
                %if change == 'M':

			




	
	
	
		
 
                  <img id="${FID}_image-diff-img-a" class="img-diff img-diff-swapable" style="display:none"

			




	
	
	
		
 
                      realsrc="${h.url('files_raw_home',repo_name=c.repo_name,revision=cs1,f_path=path)}" />

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                %if change in 'AM':

			




	
	
	
		
 
                  <img id="${FID}_image-diff-img-b" class="img-diff img-diff-swapable" style="display:none"

			




	
	
	
		
 
                      realsrc="${h.url('files_raw_home',repo_name=c.repo_name,revision=cs2,f_path=path)}" />

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
%endfor

			




	
	
	
		
 
</div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="diff_block_simple(change)">

			




	
	
		
 
@@ -83,50 +82,49 @@

			




	
	
	
		
 
                    <a class="spantag" href="${h.url('files_home', repo_name=c.a_repo.repo_name, f_path=filenode_path, revision=c.a_rev)}">${h.short_id(c.a_ref_name) if c.a_ref_type=='rev' else c.a_ref_name}</a>

			




	
	
	
		
 
                    <i class="icon-right"></i>

			




	
	
	
		
 
                    <a class="spantag" href="${h.url('files_home', repo_name=c.cs_repo.repo_name, f_path=filenode_path, revision=c.cs_rev)}">${h.short_id(c.cs_ref_name) if c.cs_ref_type=='rev' else c.cs_ref_name}</a>

			




	
	
	
		
 
                  %elif op == 'D':

			




	
	
	
		
 
                    ${_('Deleted')}

			




	
	
	
		
 
                    <a class="spantag" href="${h.url('files_home', repo_name=c.a_repo.repo_name, f_path=filenode_path, revision=c.a_rev)}">${h.short_id(c.a_ref_name) if c.a_ref_type=='rev' else c.a_ref_name}</a>

			




	
	
	
		
 
                  %elif op == 'R':

			




	
	
	
		
 
                    ${_('Renamed')}

			




	
	
	
		
 
                    <a class="spantag" href="${h.url('files_home', repo_name=c.a_repo.repo_name, f_path=filenode_path, revision=c.a_rev)}">${h.short_id(c.a_ref_name) if c.a_ref_type=='rev' else c.a_ref_name}</a>

			




	
	
	
		
 
                    <i class="icon-right"></i>

			




	
	
	
		
 
                    <a class="spantag" href="${h.url('files_home', repo_name=c.cs_repo.repo_name, f_path=filenode_path, revision=c.cs_rev)}">${h.short_id(c.cs_ref_name) if c.cs_ref_type=='rev' else c.cs_ref_name}</a>

			




	
	
	
		
 
                  %else:

			




	
	
	
		
 
                    ${op}???

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="diff-actions">

			




	
	
	
		
 
                <a href="${h.url('files_diff_2way_home',repo_name=c.cs_repo.repo_name,f_path=h.safe_unicode(filenode_path),diff1=c.a_rev,diff2=c.cs_rev,diff='diff',fulldiff=1)}" class="tooltip" title="${_('Show full side-by-side diff for this file')}">

			




	
	
	
		
 
                  <i class="icon-docs"></i>

			




	
	
	
		
 
                </a>

			




	
	
	
		
 
                ${c.ignorews_url(request.GET)}

			




	
	
	
		
 
                ${c.context_url(request.GET)}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
        <div class="code-body">

			




	
	
	
		
 
            <div class="full_f_path" path="${h.safe_unicode(filenode_path)}"></div>

			




	
	
	
		
 
        <div class="code-body full_f_path" data-f_path="${h.safe_unicode(filenode_path)}">

			




	
	
	
		
 
            ${diff|n}

			




	
	
	
		
 
            %if filenode_path.rsplit('.')[-1] in ['png', 'gif', 'jpg', 'bmp']:

			




	
	
	
		
 
              <div class="btn btn-image-diff-show">Show images</div>

			




	
	
	
		
 
              %if op == 'M':

			




	
	
	
		
 
                <div id="${h.FID('',filenode_path)}_image-diff" class="btn btn-image-diff-swap" style="display:none">Press to swap images</div>

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              <div style="font-size: 0">

			




	
	
	
		
 
                %if op == 'M':

			




	
	
	
		
 
                  <img id="${h.FID('',filenode_path)}_image-diff-img-a" class="img-diff img-diff-swapable" style="display:none"

			




	
	
	
		
 
                      realsrc="${h.url('files_raw_home',repo_name=c.a_repo.repo_name,revision=c.a_rev,f_path=filenode_path) if op in 'DM' else ''}" />

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                %if op in 'AM':

			




	
	
	
		
 
                  <img id="${h.FID('',filenode_path)}_image-diff-img-b" class="img-diff img-diff-swapable" style="display:none"

			




	
	
	
		
 
                      realsrc="${h.url('files_raw_home',repo_name=c.cs_repo.repo_name,revision=c.cs_rev,f_path=filenode_path) if op in 'AM' else ''}" />

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
  %endfor

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="diff_block_js()">

			




	
	
	
		
 
<script type="text/javascript">

			




        

    



    


    



    



      

      





    
    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.