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

Use sandboxes for all JS contexts, to fix breakage, now that we have CPG anyway.

Browse Source 
--HG--
extra : rebase_source : 0eb9d8c6a8ee533d6e12d71372554163f9479cf2
This commit is contained in:
Kris Maglione
2014-02-16 13:49:49 -08:00
parent 047cc83641
commit f511ceec40
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/content/dactyl.js
View File

@@ -484,7 +484,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
if (fileName && fileName[0] == "[") if (fileName && fileName[0] == "[")
fileName = "dactyl://command-line/"; fileName = "dactyl://command-line/";
else if (!context) else if (!context)
context = ctxt || _userContext; context = ctxt || userContext;
if (isinstance(context, ["Sandbox"])) if (isinstance(context, ["Sandbox"]))
return Cu.evalInSandbox(str, context, "1.8", fileName, lineNumber); return Cu.evalInSandbox(str, context, "1.8", fileName, lineNumber);

4
common/modules/contexts.jsm
View File

@@ -138,8 +138,8 @@ var Contexts = Module("contexts", {
completer: function (context) modules.completion.group(context) completer: function (context) modules.completion.group(context)
}); });
memoize(modules, "userContext", () => contexts.Context(modules.io.getRCFile("~", true), contexts.user, [modules, true])); memoize(modules, "userContext", () => contexts.Context(modules.io.getRCFile("~", true), contexts.user, [modules, false]));
memoize(modules, "_userContext", () => contexts.Context(modules.io.getRCFile("~", true), contexts.user, [modules.userContext])); memoize(modules, "_userContext", () => modules.userContext);
}, },
cleanup: function () { cleanup: function () {

2
common/modules/javascript.jsm
View File

@@ -55,7 +55,7 @@ var JavaScript = Module("javascript", {
lazyInit: true, lazyInit: true,
newContext: function () this.modules.newContext(this.modules.userContext, true, "Dactyl JS Temp Context"), newContext: function () this.modules.newContext(this.modules.userContext, false, "Dactyl JS Temp Context"),
completers: Class.Memoize(() => Object.create(JavaScript.completers)), completers: Class.Memoize(() => Object.create(JavaScript.completers)),

10
common/modules/main.jsm
View File

@@ -132,17 +132,15 @@ var Modules = function Modules(window) {
if (normal) if (normal)
return create(proto); return create(proto);
if (services.has("dactyl") && services.dactyl.createGlobal) sandbox = Components.utils.Sandbox(window, { sandboxPrototype: proto || modules,
var sandbox = services.dactyl.createGlobal(); sandboxName: name || ("Dactyl Sandbox " + ++_id),
else wantXrays: false });
sandbox = Components.utils.Sandbox(window, { sandboxPrototype: proto || modules,
sandboxName: name || ("Dactyl Sandbox " + ++_id),
wantXrays: false });
// Hack: // Hack:
// sandbox.Object = jsmodules.Object; // sandbox.Object = jsmodules.Object;
sandbox.File = jsmodules.File; sandbox.File = jsmodules.File;
sandbox.Math = jsmodules.Math; sandbox.Math = jsmodules.Math;
sandbox.Set = jsmodules.Set;
sandbox.__proto__ = proto || modules; sandbox.__proto__ = proto || modules;
return sandbox; return sandbox;
}, },