From 417749f880ef208eaa633244356ea173103f3770 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Tue, 22 Mar 2016 22:09:02 -0700 Subject: [PATCH] Explore mode should only expose cache on first load --- dashed/assets/javascripts/explore.js | 8 +++++--- dashed/assets/javascripts/modules/dashed.js | 8 +------- dashed/assets/stylesheets/dashed.css | 1 - 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dashed/assets/javascripts/explore.js b/dashed/assets/javascripts/explore.js index dc27ce85fbe69..7ea48bcf8ea6a 100644 --- 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 index a285de1af7654..dd0e4af65a54c 100644 --- 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 index 1d56c1b3c8abe..8f67c8bcc12f6 100644 --- 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 {