gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-17 02:15:46 +01:00
Code Issues Projects Releases Wiki Activity

Don't inherit plugin contexts from modules.plugins.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-12 14:49:32 -05:00
parent a5bcb15d22
commit ff2da13c70
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
common/modules/contexts.jsm
View File

@@ -12,6 +12,8 @@ defineModule("contexts", {
use: ["commands", "options", "services", "storage", "styles", "template", "util"] use: ["commands", "options", "services", "storage", "styles", "template", "util"]
}, this); }, this);
var Const = function Const(val) Class.Property({ enumerable: true, value: val });
var Group = Class("Group", { var Group = Class("Group", {
init: function init(name, description, filter, persist) { init: function init(name, description, filter, persist) {
const self = this; const self = this;
@@ -82,7 +84,7 @@ var Contexts = Module("contexts", {
const contexts = this; const contexts = this;
this.modules = modules; this.modules = modules;
modules.plugins.contexts = {}; Object.defineProperty(modules.plugins, "contexts", Const({}));
this.groupList = []; this.groupList = [];
this.groupMap = {}; this.groupMap = {};
@@ -170,8 +172,6 @@ var Contexts = Module("contexts", {
Context: function Context(file, group, args) { Context: function Context(file, group, args) {
const { contexts, io, newContext, plugins, userContext } = this.modules; const { contexts, io, newContext, plugins, userContext } = this.modules;
function Const(val) Class.Property({ enumerable: true, value: val });
let isPlugin = array.nth(io.getRuntimeDirectories("plugins"), let isPlugin = array.nth(io.getRuntimeDirectories("plugins"),
function (dir) dir.contains(file, true), function (dir) dir.contains(file, true),
0); 0);
@@ -179,7 +179,9 @@ var Contexts = Module("contexts", {
function (dir) dir.contains(file, true), function (dir) dir.contains(file, true),
0); 0);
let self = set.has(plugins, file.path) && plugins[file.path]; let contextPath = file.path;
let self = set.has(plugins, contextPath) && plugins.contexts[contextPath];
if (self) { if (self) {
if (set.has(self, "onUnload")) if (set.has(self, "onUnload"))
self.onUnload(); self.onUnload();
@@ -189,7 +191,7 @@ var Contexts = Module("contexts", {
: file.leafName; : file.leafName;
self = update(newContext.apply(null, args || [userContext]), { self = update(newContext.apply(null, args || [userContext]), {
NAME: Const(name.replace(/\..*/, "").replace(/-([a-z])/g, function (m, n1) n1.toUpperCase())), NAME: Const(name.replace(/\.[^.]*$/, "").replace(/-([a-z])/g, function (m, n1) n1.toUpperCase())),
PATH: Const(file.path), PATH: Const(file.path),
@@ -206,6 +208,9 @@ var Contexts = Module("contexts", {
if (plugins[this.PATH] === this) if (plugins[this.PATH] === this)
delete plugins[this.PATH]; delete plugins[this.PATH];
if (plugins.contexts[contextPath] === this)
delete plugins.contexts[contextPath];
if (!this.GROUP.builtin) if (!this.GROUP.builtin)
contexts.removeGroup(this.GROUP); contexts.removeGroup(this.GROUP);
}) })
@@ -234,11 +239,11 @@ var Contexts = Module("contexts", {
Class.replaceProperty(self, "GROUP", group); Class.replaceProperty(self, "GROUP", group);
Class.replaceProperty(self, "group", group); Class.replaceProperty(self, "group", group);
return plugins.contexts[file.path] = self; return plugins.contexts[contextPath] = self;
}, },
Script: function Script(file, group) { Script: function Script(file, group) {
return this.Context(file, group, [this.modules.plugins, true]); return this.Context(file, group, [this.modules.userContext, true]);
}, },
context: null, context: null,