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

Implement parent groups.

Browse Source
This commit is contained in:
Kris Maglione
2011-09-27 15:20:03 -04:00
parent 77d8526b43
commit 9c609f24f2
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
common/modules/contexts.jsm
View File

@@ -22,8 +22,11 @@ var Group = Class("Group", {
this.filter = filter || this.constructor.defaultFilter; this.filter = filter || this.constructor.defaultFilter;
this.persist = persist || false; this.persist = persist || false;
this.hives = []; this.hives = [];
this.children = [];
}, },
get contexts() this.modules.contexts,
set lastDocument(val) { this._lastDocument = val && Cu.getWeakReference(val); }, set lastDocument(val) { this._lastDocument = val && Cu.getWeakReference(val); },
get lastDocument() this._lastDocument && this._lastDocument.get(), get lastDocument() this._lastDocument && this._lastDocument.get(),
@@ -36,10 +39,14 @@ var Group = Class("Group", {
this.hives = []; this.hives = [];
for (let hive in keys(this.hiveMap)) for (let hive in keys(this.hiveMap))
delete this[hive]; delete this[hive];
this.children.splice(0).forEach(this.contexts.closure.removeGroup);
}, },
destroy: function destroy() { destroy: function destroy() {
for (let hive in values(this.hives)) for (let hive in values(this.hives))
util.trapErrors("destroy", hive); util.trapErrors("destroy", hive);
this.children.splice(0).forEach(this.contexts.closure.removeGroup);
}, },
argsExtra: function argsExtra() ({}), argsExtra: function argsExtra() ({}),
@@ -330,6 +337,7 @@ var Contexts = Module("contexts", {
if (replace) { if (replace) {
util.trapErrors("cleanup", group); util.trapErrors("cleanup", group);
if (description) if (description)
group.description = description; group.description = description;
if (filter) if (filter)
@@ -341,7 +349,7 @@ var Contexts = Module("contexts", {
return group; return group;
}, },
removeGroup: function removeGroup(name, filter) { removeGroup: function removeGroup(name) {
if (isObject(name)) { if (isObject(name)) {
if (this.groupList.indexOf(name) === -1) if (this.groupList.indexOf(name) === -1)
return; return;
@@ -530,8 +538,16 @@ var Contexts = Module("contexts", {
if (args.context) { if (args.context) {
args.context.group = group; args.context.group = group;
if (args.context.context) if (args.context.context) {
args.context.context.group = group; args.context.context.group = group;
let parent = args.context.context.GROUP;
if (parent && parent != group) {
group.parent = parent;
if (!~parent.children.indexOf(group))
parent.children.push(group);
}
}
} }
util.assert(!group.builtin || util.assert(!group.builtin ||