kallithea Changeset - 55af73733793

Changeset - 55af73733793

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 7 years ago 2018-12-25 20:23:42
mads@kiilerich.com

files: more cleanup of what history "state" actually is

1 file changed with 5 insertions and 12 deletions:

kallithea/templates/files/files.html

0 comments (0 inline, 0 general)

kallithea/templates/files/files.html

➞

Show inline comments

@@ @@ -71,27 +71,27 @@ var ypjax_links = function(){ @@
         var parts2 = parts[1].split('/');
         var rev = parts2.shift(); // pop the first element which is the revision
         var f_path = parts2.join('/');
         //page title - make this consistent with title mako block above
         var title = ${h.jshtml(_('%s Files') % c.repo_name)} + " \u00B7 " + (f_path || '/') + " \u00B7 " + ${h.jshtml(c.site_name)};
         var _node_list_url = node_list_url.replace('__REV__',rev).replace('__FPATH__', f_path);
         var _url_base = url_base.replace('__REV__',rev);
         // Change our States and save some data for handling events
-        var data = {url:url,title:title, url_base:_url_base,
+        var state = {url:url, title:title, url_base:_url_base,
                     node_list_url:_node_list_url, rev:rev, f_path:f_path};
-        History.pushState(data, title, url);
+        History.pushState(state, title, url);
         //now we're sure that we can do ypjax things
         e.preventDefault();
         return false;
     });
+}
 var post_load_state = function(state) {
     ypjax_links();
     tooltip_activate();
     if(state !== undefined) {
@@ @@ -213,34 +213,27 @@ $(document).ready(function(){ @@
             post_load_state(State.data);
+        }
         else{
             asynchtml(State.url, $files_data, function(){
                     post_load_state(State.data);
                     var expire_on = new Date().getTime() + CACHE_EXPIRE;
                     CACHE[cache_key] = [expire_on, $files_data.html()];
                 });
+        }
     });
     // init the search filter
     var _State = {
        url: ${h.js(h.url.current())},
        data: {
          node_list_url: node_list_url.replace('__REV__',${h.js(c.changeset.raw_id)}).replace('__FPATH__', ${h.js(h.safe_unicode(c.file.path))}),
          url_base: url_base.replace('__REV__',${h.js(c.changeset.raw_id)}),
          rev:${h.js(c.changeset.raw_id)},
          f_path: ${h.js(h.safe_unicode(c.file.path))}
+       }
+    }
     fileBrowserListeners(_State.data.node_list_url, _State.data.url_base);
     var _node_list_url = node_list_url.replace('__REV__', ${h.js(c.changeset.raw_id)}).replace('__FPATH__', ${h.js(h.safe_unicode(c.file.path))});
     var _url_base = url_base.replace('__REV__', ${h.js(c.changeset.raw_id)});
     fileBrowserListeners(_node_list_url, _url_base);
     // change branch filter
     $("#branch_selector").select2({
         dropdownAutoWidth: true,
         maxResults: 50,
         sortResults: branchSort
         });
     $("#branch_selector").change(function(e){
         var selected = e.currentTarget.options[e.currentTarget.selectedIndex].value;
         if(selected && selected != ${h.js(c.changeset.raw_id)}){
             window.location = pyroutes.url('files_home', {'repo_name': ${h.js(h.safe_unicode(c.repo_name))}, 'revision': selected, 'f_path': ${h.js(h.safe_unicode(c.file.path))}});

0 comments (0 inline, 0 general)