gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-14 01:35:46 +01:00
Code Issues Projects Releases Wiki Activity

Remove more cruft.

Browse Source
This commit is contained in:
Kris Maglione
2014-02-16 21:21:28 -08:00
parent e99de42d1c
commit 2ba1a6ec5c
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/content/dactyl.js
View File

@@ -460,12 +460,9 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
}, },
userEval: function userEval(str, context, fileName, lineNumber) { userEval: function userEval(str, context, fileName, lineNumber) {
let ctxt; let ctxt,
if (jsmodules.__proto__ != window && jsmodules.__proto__ != XPCNativeWrapper(window) && info = contexts.context;
jsmodules.isPrototypeOf(context))
str = "with (window) { with (modules) { (this.eval || eval)(" + str.quote() + ") } }";
let info = contexts.context;
if (fileName == null) if (fileName == null)
if (info) if (info)
({ file: fileName, line: lineNumber, context: ctxt }) = info; ({ file: fileName, line: lineNumber, context: ctxt }) = info;
@@ -475,12 +472,12 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
else if (!context) else if (!context)
context = ctxt || userContext; context = ctxt || userContext;
if (isinstance(context, ["Sandbox"]))
return Cu.evalInSandbox(str, context, "1.8", fileName, lineNumber);
if (!context) if (!context)
context = userContext || ctxt; context = userContext || ctxt;
if (isinstance(context, ["Sandbox"]))
return Cu.evalInSandbox(str, context, "1.8", fileName, lineNumber);
if (services.has("dactyl") && services.dactyl.evalInContext) if (services.has("dactyl") && services.dactyl.evalInContext)
return services.dactyl.evalInContext(str, context, fileName, lineNumber); return services.dactyl.evalInContext(str, context, fileName, lineNumber);