From fbddda46bbc7e4369466efb28db3176c1c78e42f Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 4 Mar 2015 02:01:04 -0700 Subject: [PATCH 1/2] start contentscript: don't query href twice --- src/js/contentscript-start.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/js/contentscript-start.js b/src/js/contentscript-start.js index e2eb6f0a2..6fba5730c 100644 --- a/src/js/contentscript-start.js +++ b/src/js/contentscript-start.js @@ -156,11 +156,12 @@ var hideElements = function(selectors) { } }; +var url = window.location.href; localMessager.send( { what: 'retrieveDomainCosmeticSelectors', - pageURL: window.location.href, - locationURL: window.location.href + pageURL: url, + locationURL: url }, filteringHandler ); From 4a10a51d20a732dc704e57ec60247c0e8ff4e44b Mon Sep 17 00:00:00 2001 From: Deathamns Date: Wed, 4 Mar 2015 12:29:29 +0100 Subject: [PATCH 2/2] Firefox: different way for reloading a tab --- platform/firefox/vapi-background.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js index ed74663f6..4b3ed7f54 100644 --- a/platform/firefox/vapi-background.js +++ b/platform/firefox/vapi-background.js @@ -768,12 +768,7 @@ vAPI.tabs.reload = function(tabId) { return; } - if ( vAPI.fennec ) { - tab.browser.reload(); - return; - } - - getOwnerWindow(tab).gBrowser.reloadTab(tab); + getBrowserForTab(tab).webNavigation.reload(0); }; /******************************************************************************/