From 76639f528a0eb746692736b9a1ff29384182b1e2 Mon Sep 17 00:00:00 2001 From: gorhill Date: Sun, 19 Nov 2017 18:18:02 -0500 Subject: [PATCH] fix #819 --- platform/chromium/vapi-background.js | 4 ++-- src/js/messaging.js | 2 +- src/js/popup.js | 5 +++-- src/js/tab.js | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js index de5ea98..ca51e4a 100644 --- a/platform/chromium/vapi-background.js +++ b/platform/chromium/vapi-background.js @@ -339,14 +339,14 @@ vAPI.tabs.remove = function(tabId) { /******************************************************************************/ -vAPI.tabs.reload = function(tabId /*, flags*/) { +vAPI.tabs.reload = function(tabId, bypassCache) { if ( typeof tabId === 'string' ) { tabId = parseInt(tabId, 10); } if ( isNaN(tabId) ) { return; } - chrome.tabs.reload(tabId); + chrome.tabs.reload(tabId, { bypassCache: bypassCache === true }); }; /******************************************************************************/ diff --git a/src/js/messaging.js b/src/js/messaging.js index 4d5bbd2..e67086d 100644 --- a/src/js/messaging.js +++ b/src/js/messaging.js @@ -54,7 +54,7 @@ function onMessage(request, sender, callback) { switch ( request.what ) { case 'forceReloadTab': - µm.forceReload(request.tabId); + µm.forceReload(request.tabId, request.bypassCache); break; case 'forceUpdateAssets': diff --git a/src/js/popup.js b/src/js/popup.js index 86eb528..7f479dd 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -1197,10 +1197,11 @@ function revertAll() { /******************************************************************************/ -function buttonReloadHandler() { +function buttonReloadHandler(ev) { messager.send({ what: 'forceReloadTab', - tabId: matrixSnapshot.tabId + tabId: matrixSnapshot.tabId, + bypassCache: ev.shiftKey }); } diff --git a/src/js/tab.js b/src/js/tab.js index 82b2dc1..d565f4b 100644 --- a/src/js/tab.js +++ b/src/js/tab.js @@ -570,8 +570,8 @@ vAPI.tabs.registerListeners(); /******************************************************************************/ -µm.forceReload = function(tabId) { - vAPI.tabs.reload(tabId, { bypassCache: true }); +µm.forceReload = function(tabId, bypassCache) { + vAPI.tabs.reload(tabId, bypassCache); }; /******************************************************************************/