external/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-21 05:16:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

code review: no need for {inline-script} suffix

Browse source
This commit is contained in:
gorhill 2015-04-22 09:23:36 -04:00
parent b65eeacbaf
commit 27de7d4323
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/js/traffic.js
View file

@ -315,10 +315,10 @@ var onHeadersReceived = function(details) {
return; return;
} }
// Frame id of frame request is the their own id, while the request is made // Frame id of frame request is their own id, while the request is made
// in the context of the parent. // in the context of the parent.
var context = pageStore.createContextFromFrameId(details.parentFrameId); var context = pageStore.createContextFromFrameId(details.parentFrameId);
context.requestURL = details.url + '{inline-script}'; context.requestURL = details.url;
context.requestHostname = details.hostname; context.requestHostname = details.hostname;
context.requestType = 'inline-script'; context.requestType = 'inline-script';
@ -345,14 +345,12 @@ var onHeadersReceived = function(details) {
var onRootFrameHeadersReceived = function(details) { var onRootFrameHeadersReceived = function(details) {
var tabId = details.tabId; var tabId = details.tabId;
var requestURL = details.url;
var requestHostname = details.hostname;
var µb = µBlock; var µb = µBlock;
// Check if the main_frame is a download // Check if the main_frame is a download
// ... // ...
if ( headerValue(details.responseHeaders, 'content-disposition').lastIndexOf('attachment', 0) === 0 ) { if ( headerValue(details.responseHeaders, 'content-disposition').lastIndexOf('attachment', 0) === 0 ) {
µb.tabContextManager.unpush(tabId, requestURL); µb.tabContextManager.unpush(tabId, details.url);
} }
// Lookup the page store associated with this tab id. // Lookup the page store associated with this tab id.
@ -363,8 +361,8 @@ var onRootFrameHeadersReceived = function(details) {
// I can't think of how pageStore could be null at this point. // I can't think of how pageStore could be null at this point.
var context = pageStore.createContextFromPage(); var context = pageStore.createContextFromPage();
context.requestURL = requestURL + '{inline-script}'; context.requestURL = details.url;
context.requestHostname = requestHostname; context.requestHostname = details.hostname;
context.requestType = 'inline-script'; context.requestType = 'inline-script';
var result = pageStore.filterRequestNoCache(context); var result = pageStore.filterRequestNoCache(context);