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

Simplify some things that were decidedly unsimple.

Browse Source 
--HG--
branch : groups
This commit is contained in:
Kris Maglione
2011-02-05 04:22:05 -05:00
parent ba0b5bdd9e
commit dd583dba9c
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/content/contexts.js
View File

@@ -11,9 +11,6 @@ var Group = Class("Group", {
this.description = description; this.description = description;
this.filter = filter || function (uri) true; this.filter = filter || function (uri) true;
this.persist = persist || false; this.persist = persist || false;
this.subGroups = { __proto__: this.subGroups, owner: this };
this.subGroups.instance = this.subGroups;
}, },
get toStringParams() [this.name], get toStringParams() [this.name],
@@ -40,15 +37,15 @@ var Group = Class("Group", {
this.Group = constructor; this.Group = constructor;
this.name = name; this.name = name;
memoize(Group.prototype.subGroups, name, memoize(Group.prototype, name,
function () constructor(this.owner.name, this.owner.description, function () constructor(this.name, this.description,
this.owner.filter, this.owner.persist)); this.filter, this.persist));
memoize(Group.subGroup, name, memoize(Group.subGroup, name,
function () Object.create({ _subGroup: name, __proto__: contexts.subGroupProto })); function () Object.create({ _subGroup: name, __proto__: contexts.subGroupProto }));
memoize(Group.subGroups, name, memoize(Group.subGroups, name,
function () [g.subGroups[name] for (g in values(this.groups)) if (set.has(g.subGroups, name))]); function () [group[name] for (group in values(this.groups)) if (set.has(group, name))]);
} }
}) })
}); });
@@ -84,7 +81,7 @@ var Contexts = Module("contexts", {
let group = Group(name, description, filter, persist); let group = Group(name, description, filter, persist);
this.groupList.unshift(group); this.groupList.unshift(group);
this.groupMap[name] = group; this.groupMap[name] = group;
this.subGroupProto.__defineGetter__(name, function () group.subGroups[this._subGroup]); this.subGroupProto.__defineGetter__(name, function () group[this._subGroup]);
return group; return group;
}, },
@@ -107,7 +104,7 @@ var Contexts = Module("contexts", {
getGroup: function getGroup(name, subGroup) { getGroup: function getGroup(name, subGroup) {
let group = array.nth(this.groupList, function (h) h.name == name, 0) || null; let group = array.nth(this.groupList, function (h) h.name == name, 0) || null;
if (group && subGroup) if (group && subGroup)
return group.subGroups[subGroup]; return group[subGroup];
return group; return group;
}, },

2
common/content/mappings.js
View File

@@ -633,7 +633,7 @@ var Mappings = Module("mappings", {
names: ["-group", "-g"], names: ["-group", "-g"],
description: "Mapping group to which to add this mapping", description: "Mapping group to which to add this mapping",
type: ArgType("map-group", function (group) isString(group) ? contexts.getGroup(group, "mappings") : group), type: ArgType("map-group", function (group) isString(group) ? contexts.getGroup(group, "mappings") : group),
get default() (contexts.context && contexts.context.group || contexts.user).subGroups.mappings, get default() (contexts.context && contexts.context.group || contexts.user).mappings,
completer: function (context) completion.group(context) completer: function (context) completion.group(context)
}; };
let modeFlag = { let modeFlag = {