kallithea Changeset - 9f754ef1c18f

Changeset - 9f754ef1c18f

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 10 years ago 2016-01-05 16:55:52
madski@unity3d.com

diff: make diff_block_simple (and thus pull request diffs) collapsable as changeset diffs are

I am not sure this is useful when the whole diff is sent to the client side
anyway ... but for now, let's be consistent.

1 file changed with 5 insertions and 0 deletions:

kallithea/templates/changeset/diff_block.html

0 comments (0 inline, 0 general)

kallithea/templates/changeset/diff_block.html

➞

Show inline comments

@@ @@ -57,24 +57,28 @@ @@
                   <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(files, changes)">
 <div class="diff-collapse">
     <span target="${'diff-container-%s' % (id(changes))}" class="diff-collapse-button">&uarr; ${_('Collapse Diff')} &uarr;</span>
 </div>
 <div class="diff-container" id="${'diff-container-%s' % (id(changes))}">
   %for fid, ch, f, stat in files:
     <%
     op, filenode_path, diff = changes[fid]
     %>
     <div id="${h.FID('',filenode_path)}_target" style="clear:both;margin-top:25px"></div>
     <div id="${h.FID('',filenode_path)}" class="diffblock  margined comm">
       <div class="code-header">
           <div class="changeset_header">
               <div class="changeset_file">
                   ${h.safe_unicode(filenode_path)} |
                   ## TODO: link to ancestor and head of other instead of exactly other
                   %if op == 'A':
@@ @@ -117,24 +121,25 @@ @@
                   <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
 </div>
 </%def>
 <%def name="diff_block_js()">
 <script type="text/javascript">
 $(document).ready(function(){
     $('.btn-image-diff-show').click(function(e){
         $('.btn-image-diff-show').hide();
         $('.btn-image-diff-swap').show();
         $('.img-diff-swapable')
             .each(function(i,e){
                     $(e).prop('src', $(e).attr('realsrc'));
                 })

0 comments (0 inline, 0 general)