CodeMirror/uMatrix
1
0
Fork 0
mirror of https://github.com/gorhill/uMatrix.git synced 2024-06-26 18:10:39 +12:00
Code Issues Releases Wiki Activity

Firefox: remove evalInSandbox

Browse source 
Probably we won't eval plain text code, which makes it unnecessary, also
this way the validator on AMO won't complain about it.
This commit is contained in:
Deathamns 2015-01-27 13:31:17 +01:00 committed by gorhill
parent cd52352995
commit 45cd3305d1
1 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
platform/firefox/frameModule.js
View file

@ -183,14 +183,9 @@ const contentObserver = {
wantXHRConstructor: false
});
sandbox.injectScript = function(script, evalCode) {
if ( evalCode ) {
Cu.evalInSandbox(script, this);
return;
}
Services.scriptloader.loadSubScript(script, this);
}.bind(sandbox);
sandbox.injectScript = function(script) {
Services.scriptloader.loadSubScript(script, sandbox);
};
}
else {
sandbox = win;
@ -200,43 +195,43 @@ const contentObserver = {
sandbox.sendAsyncMessage = messager.sendAsyncMessage;
sandbox.addMessageListener = function(callback) {
if ( this._messageListener_ ) {
this.removeMessageListener(
this._sandboxId_,
this._messageListener_
if ( sandbox._messageListener_ ) {
sandbox.removeMessageListener(
sandbox._sandboxId_,
sandbox._messageListener_
);
}
this._messageListener_ = function(message) {
sandbox._messageListener_ = function(message) {
callback(message.data);
};
messager.addMessageListener(
this._sandboxId_,
this._messageListener_
sandbox._sandboxId_,
sandbox._messageListener_
);
messager.addMessageListener(
hostName + ':broadcast',
this._messageListener_
sandbox._messageListener_
);
}.bind(sandbox);
};
sandbox.removeMessageListener = function() {
try {
messager.removeMessageListener(
this._sandboxId_,
this._messageListener_
sandbox._sandboxId_,
sandbox._messageListener_
);
messager.removeMessageListener(
hostName + ':broadcast',
this._messageListener_
sandbox._messageListener_
);
} catch (ex) {
// It throws sometimes, mostly when the popup closes
}
this._messageListener_ = null;
}.bind(sandbox);
sandbox._messageListener_ = null;
};
return sandbox;
},