kallithea Changeset - 6b7a0cd02857

Changeset - 6b7a0cd02857

Parent rev.

Child rev.

[Not reviewed]

stable

0 1 0

Mads Kiilerich - 7 years ago 2019-04-30 19:05:16
mads@kiilerich.com

files: avoid duplicated "Select changeset" select2 controls on file source pages (Issue #343)

Sometimes, when reusing cached data, the DOM part of select2 activation would
be reused, but not the actual activation. Repeated select2 activation would
thus give duplicated DOM entries.

Select2 doeesn't seem to have a good way to unload or redo, so instead just try
to remove the old DOM parts.

1 file changed with 1 insertions and 0 deletions:

kallithea/templates/files/files.html

0 comments (0 inline, 0 general)

kallithea/templates/files/files.html

➞

Show inline comments

@@ @@ -118,96 +118,97 @@ var post_load_state = function(state) { @@
         //initially loaded stuff
         var _f_path = state.f_path;
         var _rev = state.rev;
         fileBrowserListeners(state.node_list_url, state.url_base);
         // Inform Google Analytics of the change
         if ( typeof window.pageTracker !== 'undefined' ) {
             window.pageTracker._trackPageview(state.url);
+        }
+    }
     function highlight_lines(lines){
         for(pos in lines){
           $('#L'+lines[pos]).css('background-color','#FFFFBE');
+        }
+    }
     page_highlights = location.href.substring(location.href.indexOf('#')+1).split('L');
     if (page_highlights.length == 2){
        highlight_ranges  = page_highlights[1].split(",");
        var h_lines = [];
        for (pos in highlight_ranges){
             var _range = highlight_ranges[pos].split('-');
             if(_range.length == 2){
                 var start = parseInt(_range[0]);
                 var end = parseInt(_range[1]);
                 if (start < end){
                     for(var i=start;i<=end;i++){
                         h_lines.push(i);
+                    }
+                }
+            }
             else{
                 h_lines.push(parseInt(highlight_ranges[pos]));
+            }
+      }
       highlight_lines(h_lines);
       $('#L'+h_lines[0]).each(function(){
           this.scrollIntoView();
       });
+    }
     // select code link event
     $('#hlcode').mouseup(getSelectionLink);
     // history select field
     var cache = {};
     $('#diff1').prev('.select2-container').remove(); // Hack to handle repeated JS initialization on reused DOM
     $("#diff1").select2({
         placeholder: _TM['Select changeset'],
         dropdownAutoWidth: true,
         maxResults: 50,
         query: function(query){
           var key = 'cache';
           var cached = cache[key] ;
           if(cached) {
             var data = {results: []};
             var queryLower = query.term.toLowerCase();
             //filter results
             $.each(cached.results, function(){
                 var section = this.text;
                 var children = [];
                 $.each(this.children, function(){
                     if(children.length < 50 ?
                        ((queryLower.length == 0) || (this.text.toLowerCase().indexOf(queryLower) >= 0)) :
                        ((queryLower.length != 0) && (this.text.toLowerCase().indexOf(queryLower) == 0))) {
                         children.push(this);
+                    }
                 });
                 children = branchSort(children, undefined, query)
                 data.results.push({'text': section, 'children': children});
             });
             //push the typed in changeset
             data.results.push({'text':_TM['Specify changeset'],
                                'children': [{'id': query.term, 'text': query.term, 'type': 'rev'}]});
             query.callback(data);
           }else{
               $.ajax({
                 url: pyroutes.url('files_history_home', {'revision': _rev, 'f_path': _f_path}),
                 data: {},
                 dataType: 'json',
                 type: 'GET',
                 success: function(data) {
                   cache[key] = data;
                   query.callback(data);
+                }
               });
+          }
+        }
     });
+}
 $(document).ready(function(){
     ypjax_links();
     // Process history navigation event and load its state

0 comments (0 inline, 0 general)