Getting browser history to work on the explore view

.gitignore

@@ -2,6 +2,7 @@
 .DS_Store
 .coverage
 _build
+_static
 panoramix/bin/panoramixc
 build
 *.db

TODO.md

@@ -2,6 +2,7 @@
 List of TODO items for Panoramix
 
 ## Features
+* **URL shortner**
 * **Dashboard URL filters:** `{dash_url}#fltin__fieldname__value1,value2`
 * **Browser history in explore.html:** use location.hash to manage query history
 * **Default slice:** choose a default slice for the dataset instead of default endpoint

docs/img

@@ -0,0 +1 @@
+../panoramix/static/img/

panoramix/static/panoramix.js

@@ -29,11 +29,9 @@ var px = (function() {
       container: container,
       container_id: container_id,
       selector: selector,
-      jsonEndpoint: function() {
+      querystring: function(){
         var parser = document.createElement('a');
         parser.href = data.json_endpoint;
-
-        // Shallow copy
         if (dashboard !== undefined){
           qrystr = parser.search + "&extra_filters=" + JSON.stringify(dashboard.filters);
         }
@@ -43,7 +41,12 @@ var px = (function() {
         else {
           qrystr = '?' + $('#query').serialize();
         }
-        var endpoint = parser.pathname + qrystr + "&json=true";
+        return qrystr;
+      },
+      jsonEndpoint: function() {
+        var parser = document.createElement('a');
+        parser.href = data.json_endpoint;
+        var endpoint = parser.pathname + this.querystring() + "&json=true";
         return endpoint;
       },
       done: function (data) {
@@ -68,7 +71,6 @@ var px = (function() {
         container.show();
         $('span.query').removeClass('disabled');
         $('#timer').addClass('btn-danger');
-        $('.btn-group.results span').attr('disabled','disabled');
         always(data);
       },
       width: function(){
@@ -78,6 +80,7 @@ var px = (function() {
         return token.height();
       },
       render: function() {
+        $('.btn-group.results span').attr('disabled','disabled');
         token.find("img.loading").show();
         container.hide();
         container.html('');
@@ -86,7 +89,6 @@ var px = (function() {
         $('#timer').removeClass('btn-danger btn-success');
         $('#timer').addClass('btn-warning');
         viz.render();
-        console.log(slice);
       },
       resize: function() {
         token.find("img.loading").show();
@@ -155,7 +157,6 @@ var px = (function() {
   }
 
   function registerViz(name, initViz) {
-
     visualizations[name] = initViz;
   }
 
@@ -266,10 +267,18 @@ var px = (function() {
         i++;
       });
     }
+    $(window).bind("popstate", function(event) {
+      // Browser back button
+      var returnLocation = history.location || document.location;
+      // Could do something more lightweight here, but we're not optimizing
+      // for the use of the back button anyways
+      returnLocation.reload();
+    });
 
     function druidify(){
       prepForm();
       $('div.alert').remove();
+      history.pushState({}, document.title, slice.querystring());
       slice.render();
     }
 

panoramix/templates/panoramix/explore.html

@@ -17,6 +17,8 @@
   </div>
 {% endmacro %}
 
+{% block title %}TEST{% endblock %}
+
 <div class="datasource">
   <form id="query" method="GET" style="display: none;">
     <div class="header">

panoramix/viz.py

@@ -107,7 +107,6 @@ def reassignments(self):
 
     def get_url(self, **kwargs):
         d = self.orig_form_data.copy()
-        d = self.form_data.copy()
         if 'action' in d:
             del d['action']
         d.update(kwargs)