Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

this fixes #184

This commit is contained in:
gorhill 2015-05-18 10:39:20 -04:00
parent ea4f4cee72
commit f0a7f8ffea
2 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/js/messaging.js
View File

@ -214,7 +214,7 @@ var getFirewallRules = function(srcHostname, desHostnames) {
/******************************************************************************/
var getStats = function(tabId, tabTitle) {
var popupDataFromTabId = function(tabId, tabTitle) {
var tabContext = µb.tabContextManager.lookup(tabId);
var r = {
advancedUserEnabled: µb.userSettings.advancedUserEnabled,
@ -263,23 +263,22 @@ var getStats = function(tabId, tabTitle) {
/******************************************************************************/
var getTargetTabId = function(tab) {
if ( !tab ) {
return '';
var popupDataFromRequest = function(request, callback) {
if ( request.tabId ) {
callback(popupDataFromTabId(request.tabId, ''));
return;
}
// If the URL is that of the network request logger, fill the popup with
// the data from the tab being observed by the logger.
// This allows a user to actually modify filtering profile for
// behind-the-scene requests.
// Extract the target tab id from the URL
var matches = tab.url.match(/[\?&]tabId=([^&]+)/);
if ( matches && matches.length === 2 ) {
return matches[1];
}
return tab.id;
// Still no target tab id? Use currently selected tab.
vAPI.tabs.get(null, function(tab) {
var tabId = '';
var tabTitle = '';
if ( tab ) {
tabId = tab.id;
tabTitle = tab.title || '';
}
callback(popupDataFromTabId(tabId, tabTitle));
});
};
/******************************************************************************/
@ -311,14 +310,7 @@ var onMessage = function(request, sender, callback) {
return;
case 'getPopupData':
if ( request.tabId === vAPI.noTabId ) {
callback(getStats(vAPI.noTabId, ''));
return;
}
vAPI.tabs.get(request.tabId, function(tab) {
// https://github.com/chrisaljoudi/uBlock/issues/1012
callback(getStats(getTargetTabId(tab), tab ? tab.title : ''));
});
popupDataFromRequest(request, callback);
return;
default:
@ -354,7 +346,7 @@ var onMessage = function(request, sender, callback) {
);
// https://github.com/gorhill/uBlock/issues/188
µb.cosmeticFilteringEngine.removeFromSelectorCache(request.srcHostname, 'net');
response = getStats(request.tabId);
response = popupDataFromTabId(request.tabId);
break;
case 'saveFirewallRules':
@ -368,7 +360,7 @@ var onMessage = function(request, sender, callback) {
case 'toggleFirewallRule':
µb.toggleFirewallRule(request);
response = getStats(request.tabId);
response = popupDataFromTabId(request.tabId);
break;
case 'toggleNetFiltering':

8
src/js/popup.js
View File

@ -801,15 +801,17 @@ var onHideTooltip = function() {
// Make menu only when popup html is fully loaded
uDom.onLoad(function () {
var tabId = null; //If there's no tab ID specified in the query string, it will default to current tab.
// If there's no tab id specified in the query string,
// it will default to current tab.
var tabId = null;
// Extract the tab id of the page this popup is for
var matches = window.location.search.match(/[\?&]tabId=([^&]+)/);
if (matches && matches.length === 2) {
if ( matches && matches.length === 2 ) {
tabId = matches[1];
}
getPopupData(tabId);
uDom('#switch').on('click', toggleNetFilteringSwitch);
uDom('#gotoPick').on('click', gotoPick);
uDom('a[href]').on('click', gotoURL);