This commit is contained in:
gorhill 2015-03-27 14:59:17 -04:00
parent 1fcc4cb17e
commit 543c3530b5
1 changed files with 11 additions and 12 deletions

View File

@ -103,13 +103,6 @@ vAPI.tabs.onPopup = function(details) {
var openerHostname = µburi.hostnameFromURI(openerURL);
var openerDomain = µburi.domainFromHostname(openerHostname);
var context = {
pageHostname: openerHostname,
pageDomain: openerDomain,
rootHostname: openerHostname,
rootDomain: openerDomain
};
var targetURL = details.targetURL;
// If the page URL is that of our "blocked page" URL, extract the URL of
@ -121,6 +114,16 @@ vAPI.tabs.onPopup = function(details) {
}
}
var context = {
pageHostname: openerHostname,
pageDomain: openerDomain,
rootHostname: openerHostname,
rootDomain: openerDomain,
requestURL: targetURL,
requestHostname: µb.URI.hostnameFromURI(targetURL),
requestType: 'popup'
};
var result = '';
// Check user switch first
@ -136,11 +139,7 @@ vAPI.tabs.onPopup = function(details) {
// https://github.com/gorhill/uBlock/issues/91
if ( pageStore ) {
pageStore.logRequest({
requestURL: targetURL,
requestHostname: µb.URI.hostnameFromURI(targetURL),
requestType: 'popup'
}, result);
pageStore.logRequest(context, result);
}
// Not blocked