kallithea Changeset - c504e3af9ee8

Changeset - c504e3af9ee8

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

domruf - 8 years ago 2017-10-02 18:24:37
dominikruf@gmail.com

js: reuse parent/child navigation code - avoid duplication

Modified by Mads Kiilerich.

2 files changed with 15 insertions and 52 deletions:

kallithea/public/js/base.js

kallithea/templates/base/base.html

0 comments (0 inline, 0 general)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -1404,172 +1404,135 @@ var MultiSelectWidget = function(selecte @@
         });
     $('#'+form_id).submit(function(){
             $selectedselect.children('option').each(function(i, e){
                 e.selected = 'selected';
             });
         });
+}
 /**
  Branch Sorting callback for select2, modifying the filtered result so prefix
  matches come before matches in the line.
  **/
 var branchSort = function(results, container, query) {
     if (query.term) {
         return results.sort(function (a, b) {
             // Put closed branches after open ones (a bit of a hack ...)
             var aClosed = a.text.indexOf("(closed)") > -1,
                 bClosed = b.text.indexOf("(closed)") > -1;
             if (aClosed && !bClosed) {
                 return 1;
+            }
             if (bClosed && !aClosed) {
                 return -1;
+            }
             // Put early (especially prefix) matches before later matches
             var aPos = a.text.toLowerCase().indexOf(query.term.toLowerCase()),
                 bPos = b.text.toLowerCase().indexOf(query.term.toLowerCase());
             if (aPos < bPos) {
                 return -1;
+            }
             if (bPos < aPos) {
                 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;
 };
 /* Helper for jQuery DataTables */
 var updateRowCountCallback = function updateRowCountCallback($elem, onlyDisplayed) {
     return function drawCallback() {
         var info = this.api().page.info(),
             count = onlyDisplayed === true ? info.recordsDisplay : info.recordsTotal;
         $elem.html(count);
+    }
 };
 /**
  * activate changeset parent/child navigation links
  */
 var activate_parent_child_links = function(){
     //next links
     $('#child_link').on('click', function(e){
     $('.parent-child-link').on('click', function(e){
         var $this = $(this);
         //fetch via ajax what is going to be the next link, if we have
         //>1 links show them to user to choose
-        if(!$('#child_link').hasClass('disabled')){
+        if(!$this.hasClass('disabled')){
             $.ajax({
-                url: $('#child_link').data('ajax-url'),
+                url: $this.data('ajax-url'),
                 success: function(data) {
-                    var repo_name = $('#child_link').data('reponame');
+                    var repo_name = $this.data('reponame');
                     if(data.results.length === 0){
                         $('#child_link').addClass('disabled');
                         $('#child_link').text(_TM['No revisions']);
                         $this.addClass('disabled');
                         $this.text(_TM['No revisions']);
+                    }
                     if(data.results.length === 1){
                         var commit = data.results[0];
                         window.location = pyroutes.url('changeset_home', {'repo_name': repo_name, 'revision': commit.raw_id});
+                    }
                     else if(data.results.length === 2){
                         $('#child_link').addClass('disabled');
                         $('#child_link').addClass('double');
                         var _html = '';
                         _html +='<a title="__title__" href="__url__">__rev__</a> <i class="icon-right-open"></i>'
                                 .replace('__rev__','r{0}:{1}'.format(data.results[0].revision, data.results[0].raw_id.substr(0,6)))
                                 .replace('__title__', data.results[0].message)
                                 .replace('__url__', pyroutes.url('changeset_home', {'repo_name': repo_name, 'revision': data.results[0].raw_id}));
                         _html +='<br/>'
                         _html +='<a title="__title__" href="__url__">__rev__</a> <i class="icon-right-open"></i>'
                                 .replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6)))
                                 .replace('__title__', data.results[1].message)
                                 .replace('__url__', pyroutes.url('changeset_home', {'repo_name': repo_name, 'revision': data.results[1].raw_id}));
                         $('#child_link').html(_html);
+                    }
+                }
             });
         e.preventDefault();
+        }
     });
     //prev links
     $('#parent_link').on('click', function(e){
         //fetch via ajax what is going to be the next link, if we have
         //>1 links show them to user to choose
         if(!$('#parent_link').hasClass('disabled')){
             $.ajax({
                 url: $('#parent_link').data('ajax-url'),
                 success: function(data) {
                     var repo_name = $('#parent_link').data('reponame');
                     if(data.results.length === 0){
                         $('#parent_link').addClass('disabled');
                         $('#parent_link').text(_TM['No revisions']);
+                    }
                     if(data.results.length === 1){
                         var commit = data.results[0];
                         window.location = pyroutes.url('changeset_home', {'repo_name': repo_name, 'revision': commit.raw_id});
+                    }
                     else if(data.results.length === 2){
                         $('#parent_link').addClass('disabled');
                         $('#parent_link').addClass('double');
                         $this.addClass('disabled');
                         $this.addClass('double');
                         var _html = '';
                         _html +='<i class="icon-left-open"></i> <a title="__title__" href="__url__">__rev__</a>'
                                 .replace('__rev__','r{0}:{1}'.format(data.results[0].revision, data.results[0].raw_id.substr(0,6)))
                                 .replace('__title__', data.results[0].message)
                                 .replace('__url__', pyroutes.url('changeset_home', {'repo_name': repo_name, 'revision': data.results[0].raw_id}));
                         _html +='<br/>'
                         _html +='<i class="icon-left-open"></i> <a title="__title__" href="__url__">__rev__</a>'
                                 .replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6)))
                                 .replace('__title__', data.results[1].message)
                                 .replace('__url__', pyroutes.url('changeset_home', {'repo_name': repo_name, 'revision': data.results[1].raw_id}));
-                        $('#parent_link').html(_html);
+                        $this.html(_html);
+                    }
+                }
             });
         e.preventDefault();
+        }
     });
+}

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -437,118 +437,118 @@ @@
+                    }
                     else if(obj_dict['repo_type'] === 'git'){
                         tmpl += '<span class="repotag">git</span> ';
+                    }
                     if(obj_dict['private']){
                         tmpl += '<i class="icon-keyhole-circled"></i> ';
+                    }
                     else if(visual_show_public_icon){
                         tmpl += '<i class="icon-globe"></i> ';
+                    }
                     tmpl += '</span>';
+                }
                 if(obj_dict && state.type == 'group'){
                         tmpl += '<i class="icon-folder"></i> ';
+                }
                 tmpl += state.text;
                 return tmpl;
+            }
             $("#repo_switcher").select2({
                 placeholder: '<i class="icon-database"></i> ' + ${h.jshtml(_('Repositories'))} + ' <span class="caret"></span>',
                 dropdownAutoWidth: true,
                 sortResults: prefixFirstSort,
                 formatResult: format,
                 formatSelection: format,
                 formatNoMatches: function(term){
                     return ${h.jshtml(_('No matches found'))};
                 },
                 containerCssClass: "repo-switcher",
                 dropdownCssClass: "repo-switcher-dropdown",
                 escapeMarkup: function(m){
                     // don't escape our custom placeholder
                     if(m.substr(0,29) == '<i class="icon-database"></i>'){
                         return m;
+                    }
                     return Select2.util.escapeMarkup(m);
                 },
                 query: function(query){
                   var key = 'cache';
                   var cached = cache[key] ;
                   if(cached) {
                     var data = {results: []};
                     //filter results
                     $.each(cached.results, function(){
                         var section = this.text;
                         var children = [];
                         $.each(this.children, function(){
                             if(query.term.length == 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0 ){
                                 children.push({'id': this.id, 'text': this.text, 'type': this.type, 'obj': this.obj});
+                            }
                         });
                         if(children.length !== 0){
                             data.results.push({'text': section, 'children': children});
+                        }
                     });
                     query.callback(data);
                   }else{
                       $.ajax({
                         url: ${h.js(h.url('repo_switcher_data'))},
                         data: {},
                         dataType: 'json',
                         type: 'GET',
                         success: function(data) {
                           cache[key] = data;
                           query.callback({results: data.results});
+                        }
                       });
+                  }
+                }
             });
             $("#repo_switcher").on('select2-selecting', function(e){
                 e.preventDefault();
                 window.location = pyroutes.url('summary_home', {'repo_name': e.val});
             });
             $(document).on('shown.bs.dropdown', function(event) {
                 var dropdown = $(event.target);
                 dropdown.attr('aria-expanded', true);
                 dropdown.find('.dropdown-menu').attr('aria-hidden', false);
             });
             $(document).on('hidden.bs.dropdown', function(event) {
                 var dropdown = $(event.target);
                 dropdown.attr('aria-expanded', false);
                 dropdown.find('.dropdown-menu').attr('aria-hidden', true);
             });
         });
     </script>
 </%def>
 <%def name="parent_child_navigation()">
     <div class="parents pull-left">
         <div class="parent_link"
     <div class="pull-left">
         <div class="parent-child-link"
              data-ajax-url="${h.url('changeset_parents',repo_name=c.repo_name, revision=c.changeset.raw_id)}"
              data-reponame="${c.repo_name}">
             <i class="icon-left-open"></i> <a href="#">${_('Parent rev.')}</a>
         </div>
     </div>
     <div class="children pull-right">
         <div class="child_link"
     <div class="pull-right">
         <div class="parent-child-link"
              data-ajax-url="${h.url('changeset_children',repo_name=c.repo_name, revision=c.changeset.raw_id)}"
              data-reponame="${c.repo_name}">
             <a href="#">${_('Child rev.')}</a> <i class="icon-right-open"></i>
         </div>
     </div>
     <script type="text/javascript">
       $(document).ready(function(){
           activate_parent_child_links();
       });
     </script>
 </%def>

0 comments (0 inline, 0 general)