gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-04-07 23:23:31 +02:00
Code Issues Projects Releases Wiki Activity

Insert window into the modules prototype chain again, for the time being. Closes issue #100.

Browse Source
This commit is contained in:
Kris Maglione
2010-10-20 02:18:48 -04:00
parent 4ce5925ace
commit 75689d11bf
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/content/dactyl.js
View File

@@ -297,8 +297,7 @@ const Dactyl = Module("dactyl", {
if (!context) if (!context)
context = userContext; context = userContext;
context[EVAL_STRING] = str; return Cu.evalInSandbox(str, context, "1.8", fileName, lineNumber);
return Cu.evalInSandbox("with (window) { this.eval(" + EVAL_STRING + ") }", context, "1.8", fileName, lineNumber);
}, },
/** /**
@@ -1976,9 +1975,6 @@ const Dactyl = Module("dactyl", {
}, 1000); }, 1000);
} }
// always start in normal mode
modes.reset();
// TODO: we should have some class where all this guioptions stuff fits well // TODO: we should have some class where all this guioptions stuff fits well
// Dactyl.hideGUI(); // Dactyl.hideGUI();
@@ -1993,6 +1989,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);
try { try {
if (dactyl.commandLineOptions.rcFile) { if (dactyl.commandLineOptions.rcFile) {
let filename = dactyl.commandLineOptions.rcFile; let filename = dactyl.commandLineOptions.rcFile;