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

Make userContext a proper Context.

Browse Source
This commit is contained in:
Kris Maglione
2011-03-15 18:22:44 -04:00
parent a0ca379cfd
commit afbe703985
5 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/modules/base.jsm
View File

@@ -620,6 +620,7 @@ function memoize(obj, key, getter) {
});
}
catch (e) {
util.reportError(e);
obj[key] = getter.call(obj, key);
}
}

7
common/modules/contexts.jsm
View File

@@ -109,6 +109,9 @@ var Contexts = Module("contexts", {
completer: function (context) modules.completion.group(context)
});
memoize(modules, "userContext", function () contexts.Context(modules.io.getRCFile("~"), contexts.user, [modules, true]));
memoize(modules, "_userContext", function () contexts.Context(modules.io.getRCFile("~"), contexts.user, [modules.userContext]));
},
cleanup: function () {
@@ -187,7 +190,7 @@ var Contexts = Module("contexts", {
let name = isPlugin ? file.getRelativeDescriptor(isPlugin).replace(File.PATH_SEP, "-")
: file.leafName;
self = update(newContext.apply(null, args || [userContext]), {
self = update(args && !isArray(args) ? args : newContext.apply(null, args || [userContext]), {
NAME: Const(name.replace(/\.[^.]*$/, "").replace(/-([a-z])/g, function (m, n1) n1.toUpperCase())),
PATH: Const(file.path),
@@ -212,7 +215,7 @@ var Contexts = Module("contexts", {
contexts.removeGroup(this.GROUP);
})
});
Class.replaceProperty(plugins, file.path, self);
// Class.replaceProperty(plugins, file.path, self);
// This belongs elsewhere
if (isPlugin && args)