gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-07 16:14:12 +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

3
common/content/dactyl.js
View File

@@ -12,9 +12,6 @@ default xml namespace = XHTML;
XML.ignoreWhitespace = false;
XML.prettyPrinting = false;
var userContext = { __proto__: modules };
var _userContext = newContext(userContext);
var EVAL_ERROR = "__dactyl_eval_error";
var EVAL_RESULT = "__dactyl_eval_result";
var EVAL_STRING = "__dactyl_eval_string";

19
common/content/tabs.js
View File

@@ -375,19 +375,14 @@ var Tabs = Module("tabs", {
* reloading.
*/
reloadAll: function (bypassCache) {
if (bypassCache) {
for (let i = 0; i < config.tabbrowser.mTabs.length; i++) {
try {
this.reload(config.tabbrowser.mTabs[i], bypassCache);
}
catch (e) {
// FIXME: can we do anything useful here without stopping the
// other tabs from reloading?
}
this.visibleTabs.forEach(function (tab) {
try {
this.reload(config.tabbrowser.mTabs[i], bypassCache);
}
}
else
config.tabbrowser.reloadAllTabs();
catch (e) {
dactyl.reportError(e, true);
}
});
},
/**

2
common/locale/en-US/map.xml
View File

@@ -122,7 +122,7 @@
<dt>-group=<a>group</a></dt> <dd>Add this command to the given <t>group</t> (short name <em>-g</em>)</dd>
<dt>-javascript</dt> <dd>Execute <a>rhs</a> as JavaScript rather than keys (short names <em>-js</em>, <em>-j</em>)</dd>
<dt>-literal=<a>n</a></dt> <dd>Parse the <a>n</a>th argument without specially processing any quote or meta characters. (short name <em>-l</em>)</dd>
<dt>-modes</dt> <dd>Create this mapping in the given modes (short names <em>-mode</em>, <em>-m</em>)</dd>
<dt>-modes=<a>modes</a></dt> <dd>Create this mapping in the given modes (short names <em>-mode</em>, <em>-m</em>)</dd>
<dt>-nopersist</dt> <dd>Do not save this mapping to an auto-generated rc file (short name <em>-n</em>)</dd>
<dt>-silent</dt> <dd>Do not echo any generated keys to the command line (short name <em>-s</em>, also <em>&lt;silent></em> for Vim compatibility)</dd>
</dl>

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)