Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-10-06 09:37:12 +02:00
Code Issues Releases Wiki Activity

Firefox: fix script injection

Browse Source
This commit is contained in:
Deathamns 2014-12-17 08:46:18 +01:00
parent f74f07e092
commit e20458a00f
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
platform/firefox/frameModule.js
View File

@ -114,17 +114,6 @@ let contentPolicy = {
let docObserver = { let docObserver = {
contentBaseURI: 'chrome://' + appName + '/content/', contentBaseURI: 'chrome://' + appName + '/content/',
injectScript: function(script, evalCode) {
if (evalCode) {
Components.utils.evalInSandbox(script, this);
return;
}
Services.scriptloader.loadSubScript(
docObserver.contentBaseURI + script,
this
);
},
initContext: function(win, sandbox) { initContext: function(win, sandbox) {
let messager = getMessager(win); let messager = getMessager(win);
@ -137,10 +126,20 @@ let docObserver = {
win.self = win; win.self = win;
Components.utils.exportFunction( // anonymous function needs to be used here
this.injectScript, win.injectScript = Components.utils.exportFunction(
win, function(script, evalCode) {
{defineAs: 'injectScript'} if (evalCode) {
Components.utils.evalInSandbox(script, win);
return;
}
Services.scriptloader.loadSubScript(
docObserver.contentBaseURI + script,
win
);
},
win
); );
} }