gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-28 23:02:27 +01:00
Code Issues Projects Releases Wiki Activity

Give *.penta plugins their own JS sandboxen.

Browse Source 
--HG--
branch : key-processing
This commit is contained in:
Kris Maglione
2011-01-26 14:35:58 -05:00
parent b051e4edc2
commit 787f063692
5 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/content/dactyl.js
View File

@@ -380,15 +380,16 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
},
userEval: function (str, context, fileName, lineNumber) {
let ctxt;
if (jsmodules.__proto__ != window)
str = "with (window) { with (modules) { (this.eval || eval)(" + str.quote() + ") } }";
if (fileName == null)
if (io.sourcing && io.sourcing.file[0] !== "[")
({ file: fileName, line: lineNumber }) = io.sourcing;
({ file: fileName, line: lineNumber, context: ctxt }) = io.sourcing;
else try {
if (!context)
context = userContext;
context = userContext || ctxt;
context[EVAL_ERROR] = null;
context[EVAL_STRING] = str;
@@ -411,7 +412,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
}
if (!context)
context = _userContext;
context = _userContext || ctxt;
return Cu.evalInSandbox(str, context, "1.8", fileName, lineNumber);
},

2
common/content/mappings.js
View File

@@ -515,7 +515,7 @@ var Mappings = Module("mappings", {
description: "Accept a count before the requisite key press"
},
{
names: ["-description", "-d"],
names: ["-description", "-desc", "-d"],
description: "A description of this mapping",
default: "User-defined mapping",
type: CommandOption.STRING