Explore mode should only expose cache on first load

apache · Mar 23, 2016 · 417749f · 417749f
1 parent fded04a
commit 417749f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/dashed/assets/javascripts/explore.js b/dashed/assets/javascripts/explore.js
@@ -63,7 +63,7 @@ function druidify(force) {
   $('#is_cached').hide();
   history.pushState({}, document.title, slice.querystring());
   prepForm();
-  slice.render(force, druidify);
+  slice.render(force);
 }
 
 function initExploreView() {
@@ -256,7 +256,9 @@ function initExploreView() {
     }
   });
 
-  $(".druidify").click(druidify);
+  $(".druidify").click(function () {
+    druidify(true);
+  });
 
   function create_choices(term, data) {
     var filtered = $(data).filter(function () {
@@ -319,7 +321,7 @@ $(document).ready(function () {
   $('.slice').data('slice', slice);
 
   // call vis render method, which issues ajax
-  druidify();
+  druidify(false);
 
   // make checkbox inputs display as toggles
   $(':checkbox')

diff --git a/dashed/assets/javascripts/modules/dashed.js b/dashed/assets/javascripts/modules/dashed.js
@@ -156,7 +156,6 @@ var px = (function () {
       container: container,
       container_id: container_id,
       selector: selector,
-      druidify: null,
       querystring: function () {
         var parser = document.createElement('a');
         parser.href = data.json_endpoint;
@@ -185,16 +184,12 @@ var px = (function () {
         clearInterval(timer);
         token.find("img.loading").hide();
         container.show();
-        var that = this;
 
         var cachedSelector = null;
         if (dashboard === undefined) {
           cachedSelector = $('#is_cached');
           if (data !== undefined && data.is_cached) {
             cachedSelector
-              .click(function () {
-                that.druidify(true);
-              })
               .attr('title', 'Served from data cached at ' + data.cached_dttm + '. Click to force-refresh')
               .show()
               .tooltip('fixTitle');
@@ -271,11 +266,10 @@ var px = (function () {
           }, 500);
         });
       },
-      render: function (force, druidify) {
+      render: function (force) {
         if (force === undefined) {
           force = false;
         }
-        this.druidify = druidify;
         this.force = force;
         token.find("img.loading").show();
         container.hide();

diff --git a/dashed/assets/stylesheets/dashed.css b/dashed/assets/stylesheets/dashed.css
@@ -252,7 +252,6 @@ li.widget .chart-header a {
 
 #is_cached {
   display: none;
-  cursor: pointer;
 }
 
 li.widget .chart-controls {