kallithea Changeset - e8229d389948

Changeset - e8229d389948

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

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

js: move .diff-collapse-button handling from the global base.js to the special diff js

Move it where it belongs and avoid adding more stuff to the global js later.

2 files changed with 13 insertions and 17 deletions:

kallithea/public/js/base.js

kallithea/templates/changeset/diff_block.html

0 comments (0 inline, 0 general)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -1867,65 +1867,48 @@ var branchSort = function(results, conta @@
+            }
             if (bPos === 0 && aPos !== 0) {
                 return 1;
+            }
             // Default sorting
             if (a.text > b.text) {
                 return 1;
+            }
             if (a.text < b.text) {
                 return -1;
+            }
             return 0;
         });
+    }
     return results;
 };
 var prefixFirstSort = function(results, container, query) {
     if (query.term) {
         return results.sort(function (a, b) {
             // if parent node, no sorting
             if (a.children != undefined || b.children != undefined) {
                 return 0;
+            }
             // Put prefix matches before matches in the line
             var aPos = a.text.toLowerCase().indexOf(query.term.toLowerCase()),
                 bPos = b.text.toLowerCase().indexOf(query.term.toLowerCase());
             if (aPos === 0 && bPos !== 0) {
                 return -1;
+            }
             if (bPos === 0 && aPos !== 0) {
                 return 1;
+            }
             // Default sorting
             if (a.text > b.text) {
                 return 1;
+            }
             if (a.text < b.text) {
                 return -1;
+            }
             return 0;
         });
+    }
     return results;
 };
 // global hooks after DOM is loaded
 $(document).ready(function(){
     $('.diff-collapse-button').click(function(e) {
         var $button = $(e.currentTarget);
         var $target = $('#' + $button.attr('target'));
         if($target.hasClass('hidden')){
             $target.removeClass('hidden');
             $button.html("&uarr; {0} &uarr;".format(_TM['Collapse Diff']));
+        }
         else if(!$target.hasClass('hidden')){
             $target.addClass('hidden');
             $button.html("&darr; {0} &darr;".format(_TM['Expand Diff']));
+        }
     });
 });

kallithea/templates/changeset/diff_block.html

➞

Show inline comments

@@ @@ -106,51 +106,64 @@ @@
           </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 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
 </%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'));
                 })
             .show();
         });
     $('.btn-image-diff-swap').mousedown(function(e){
         $('#'+e.currentTarget.id+'-img-a.img-diff-swapable')
           .before($('#'+e.currentTarget.id+'-img-b.img-diff-swapable'));
     });
     var reset = function(e){
         $('#'+e.currentTarget.id+'-img-a.img-diff-swapable')
           .after($('#'+e.currentTarget.id+'-img-b.img-diff-swapable'));
     };
     $('.btn-image-diff-swap').mouseup(reset);
     $('.btn-image-diff-swap').mouseleave(reset);
     $('.diff-collapse-button').click(function(e) {
         var $button = $(e.currentTarget);
         var $target = $('#' + $button.attr('target'));
         if($target.hasClass('hidden')){
             $target.removeClass('hidden');
             $button.html("&uarr; {0} &uarr;".format(_TM['Collapse Diff']));
+        }
         else if(!$target.hasClass('hidden')){
             $target.addClass('hidden');
             $button.html("&darr; {0} &darr;".format(_TM['Expand Diff']));
+        }
     });
 });
 </script>
 </%def>

0 comments (0 inline, 0 general)