From fded04a51d14ebb7ca638cc56da3a758775a858c Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Tue, 22 Mar 2016 18:10:36 -0700 Subject: [PATCH] Hack to get the force refresh in the explore view --- dashed/assets/javascripts/explore.js | 7 +++++-- dashed/assets/javascripts/modules/dashed.js | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dashed/assets/javascripts/explore.js b/dashed/assets/javascripts/explore.js index 2a3794a665..dc27ce85fb 100644 --- a/dashed/assets/javascripts/explore.js +++ b/dashed/assets/javascripts/explore.js @@ -53,14 +53,17 @@ function prepForm() { }); } -function druidify() { +function druidify(force) { + if (force === undefined) { + force = false; + } $('.query-and-save button').attr('disabled', 'disabled'); $('.btn-group.results span,a').attr('disabled', 'disabled'); $('div.alert').remove(); $('#is_cached').hide(); history.pushState({}, document.title, slice.querystring()); prepForm(); - slice.render(); + slice.render(force, druidify); } function initExploreView() { diff --git a/dashed/assets/javascripts/modules/dashed.js b/dashed/assets/javascripts/modules/dashed.js index 665149745e..a285de1af7 100644 --- a/dashed/assets/javascripts/modules/dashed.js +++ b/dashed/assets/javascripts/modules/dashed.js @@ -156,6 +156,7 @@ 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; @@ -184,6 +185,7 @@ var px = (function () { clearInterval(timer); token.find("img.loading").hide(); container.show(); + var that = this; var cachedSelector = null; if (dashboard === undefined) { @@ -191,7 +193,7 @@ var px = (function () { if (data !== undefined && data.is_cached) { cachedSelector .click(function () { - slice.render(true); + that.druidify(true); }) .attr('title', 'Served from data cached at ' + data.cached_dttm + '. Click to force-refresh') .show() @@ -269,10 +271,11 @@ var px = (function () { }, 500); }); }, - render: function (force) { + render: function (force, druidify) { if (force === undefined) { force = false; } + this.druidify = druidify; this.force = force; token.find("img.loading").show(); container.hide();