1
0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-07 03:12:33 +01:00

Merge branch 'master' of github.com:gorhill/uBlock

This commit is contained in:
gorhill 2015-03-04 10:18:54 -05:00
commit 6f3646a43d
2 changed files with 4 additions and 8 deletions

View File

@ -768,12 +768,7 @@ vAPI.tabs.reload = function(tabId) {
return; return;
} }
if ( vAPI.fennec ) { getBrowserForTab(tab).webNavigation.reload(0);
tab.browser.reload();
return;
}
getOwnerWindow(tab).gBrowser.reloadTab(tab);
}; };
/******************************************************************************/ /******************************************************************************/

View File

@ -156,11 +156,12 @@ var hideElements = function(selectors) {
} }
}; };
var url = window.location.href;
localMessager.send( localMessager.send(
{ {
what: 'retrieveDomainCosmeticSelectors', what: 'retrieveDomainCosmeticSelectors',
pageURL: window.location.href, pageURL: url,
locationURL: window.location.href locationURL: url
}, },
filteringHandler filteringHandler
); );