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

Fix some Firefox version-specific brokenness.

Browse Source
This commit is contained in:
Kris Maglione
2010-11-07 07:33:25 -05:00
parent 21fe6d9fff
commit 506c684073
6 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/content/dactyl.js
View File

@@ -297,7 +297,7 @@ const Dactyl = Module("dactyl", {
if (!context)
context = userContext;
if (!window.XPCSafeJSObjectWrapper)
if (window.isPrototypeOf(modules))
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);
},
@@ -2016,8 +2016,8 @@ const Dactyl = Module("dactyl", {
let init = services.get("environment").get(config.idName + "_INIT");
let rcFile = io.getRCFile("~");
if (!window.XPCSafeJSObjectWrapper)
jsmodules.__proto__ = XPCNativeWrapper(window);
if (dactyl.userEval('typeof document') === "undefined")
jsmodules.__proto__ = (window.XPCSafeJSObjectWrapper || XPCNativeWrapper)(window);
try {
if (dactyl.commandLineOptions.rcFile) {