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

Revert "Inject scriptlets at webNavigation.onCommitted time in Firefox" 

This reverts commit 7ee9c21b37.

Potentially related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/1696
This commit is contained in:
Raymond Hill 2021-08-26 18:36:18 -04:00
parent 498f90966d
commit 46eb3801ec
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/js/background.js
View File

@ -127,6 +127,7 @@ const µBlock = { // jshint ignore:line
privacySettingsSupported: vAPI.browserSettings instanceof Object, privacySettingsSupported: vAPI.browserSettings instanceof Object,
cloudStorageSupported: vAPI.cloud instanceof Object, cloudStorageSupported: vAPI.cloud instanceof Object,
canFilterResponseData: typeof browser.webRequest.filterResponseData === 'function', canFilterResponseData: typeof browser.webRequest.filterResponseData === 'function',
canInjectScriptletsNow: vAPI.webextFlavor.soup.has('chromium'),
// https://github.com/chrisaljoudi/uBlock/issues/180 // https://github.com/chrisaljoudi/uBlock/issues/180
// Whitelist directives need to be loaded once the PSL is available // Whitelist directives need to be loaded once the PSL is available

5
src/js/messaging.js
View File

@ -627,7 +627,10 @@ const retrieveContentScriptParameters = async function(sender, request) {
// https://github.com/uBlockOrigin/uBlock-issues/issues/688#issuecomment-748179731 // https://github.com/uBlockOrigin/uBlock-issues/issues/688#issuecomment-748179731
// For non-network URIs, scriptlet injection is deferred to here. The // For non-network URIs, scriptlet injection is deferred to here. The
// effective URL is available here in `request.url`. // effective URL is available here in `request.url`.
if ( isNetworkURI(sender.frameURL) === false ) { if (
µb.canInjectScriptletsNow === false ||
isNetworkURI(sender.frameURL) === false
) {
response.scriptlets = scriptletFilteringEngine.retrieve(request); response.scriptlets = scriptletFilteringEngine.retrieve(request);
} }

6
src/js/tab.js
View File

@ -913,7 +913,11 @@ vAPI.Tabs = class extends vAPI.Tabs {
const pageStore = µb.pageStoreFromTabId(tabId); const pageStore = µb.pageStoreFromTabId(tabId);
if ( pageStore === null ) { return; } if ( pageStore === null ) { return; }
pageStore.setFrameURL(details); pageStore.setFrameURL(details);
if ( isNetworkURI(url) && pageStore.getNetFilteringSwitch() ) { if (
µb.canInjectScriptletsNow &&
isNetworkURI(url) &&
pageStore.getNetFilteringSwitch()
) {
scriptletFilteringEngine.injectNow(details); scriptletFilteringEngine.injectNow(details);
} }
} }