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

Import part of top patch in queue: Add no-op option hive for plugin API reasons, cleanup some related code.

Browse Source
This commit is contained in:
Kris Maglione
2011-08-16 21:17:52 -04:00
parent 01fd946df1
commit 1ad3fdf195
7 changed files with 52 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/modules/contexts.jsm
View File

@@ -45,6 +45,11 @@ var Group = Class("Group", {
argsExtra: function argsExtra() ({}),
makeArgs: function makeArgs(doc, context, args) {
let res = update({ doc: doc, context: context }, args);
return update(this.argsExtra(res), args);
},
get toStringParams() [this.name],
get builtin() this.modules.contexts.builtinGroups.indexOf(this) >= 0,
@@ -288,7 +293,10 @@ var Contexts = Module("contexts", {
groups: { value: this.activeGroups(uri) }
}),
activeGroups: function (uri, doc) {
activeGroups: function (uri) {
if (uri instanceof Ci.nsIDOMDocument)
var [doc, uri] = [uri, uri.documentURIObject || util.newURI(uri.documentURI)];
if (!uri)
var { uri, doc } = this.modules.buffer;
@@ -463,6 +471,7 @@ var Contexts = Module("contexts", {
get modifiable() this.group.modifiable,
get argsExtra() this.group.argsExtra,
get makeArgs() this.group.makeArgs,
get builtin() this.group.builtin,
get name() this.group.name,