kallithea Changeset - a1a517ebf550

Changeset - a1a517ebf550

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Jan Heylen - 10 years ago 2016-01-02 10:58:06
heyleke@gmail.com

diff: fix display of images for deleted files

In preperation of refactoring diff handling, this change fixes
the handling of picture showing when a file gets deleted.

1 file changed with 2 insertions and 2 deletions:

kallithea/templates/changeset/diff_block.html

0 comments (0 inline, 0 general)

kallithea/templates/changeset/diff_block.html

➞

Show inline comments

@@ @@ -40,25 +40,25 @@ @@
                   </label>
                 </span>
             </div>
         </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':
+                %if change in 'DM':
                   <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
@@ @@ -102,25 +102,25 @@ @@
                 ${c.context_url(request.GET)}
               </div>
           </div>
       </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':
+                %if op in 'DM':
                   <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

0 comments (0 inline, 0 general)