gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-05 23:34:10 +01:00
Code Issues Projects Releases Wiki Activity

Fix FF36 colossally broken by last commit.

Browse Source
This commit is contained in:
Kris Maglione
2010-10-20 02:31:35 -04:00
parent 75689d11bf
commit 093365f753
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/content/dactyl.js
View File

@@ -297,7 +297,9 @@ const Dactyl = Module("dactyl", {
if (!context) if (!context)
context = userContext; context = userContext;
return Cu.evalInSandbox(str, context, "1.8", fileName, lineNumber); if (!window.XPCSafeJSObjectWrapper)
return Cu.evalInSandbox(str, context, "1.8", fileName, lineNumber);
return Cu.evalInSandbox("with (window) { with (modules) { this.eval(" + str.quote() + ") } }", context, "1.8", fileName, lineNumber);
}, },
/** /**
@@ -1989,7 +1991,8 @@ const Dactyl = Module("dactyl", {
let init = services.get("environment").get(config.idName + "_INIT"); let init = services.get("environment").get(config.idName + "_INIT");
let rcFile = io.getRCFile("~"); let rcFile = io.getRCFile("~");
jsmodules.__proto__ = (window.XPCSafeJSObjectWrapper || XPCNativeWrapper)(window); if (!window.XPCSafeJSObjectWrapper)
jsmodules.__proto__ = XPCNativeWrapper(window);
try { try {
if (dactyl.commandLineOptions.rcFile) { if (dactyl.commandLineOptions.rcFile) {