1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-14 06:45:51 +01:00

Merge default.

--HG--
branch : key-processing
This commit is contained in:
Kris Maglione
2011-01-25 16:20:22 -05:00
11 changed files with 42 additions and 263 deletions

View File

@@ -169,8 +169,12 @@ function endModule() {
function require(obj, name, from) {
try {
if (arguments.length === 1)
[obj, name] = [{}, obj];
defineModule.loadLog.push((from || "require") + ": loading " + name + " into " + obj.NAME);
JSMLoader.load(name + ".jsm", obj);
return obj;
}
catch (e) {
defineModule.dump("loading " + String.quote(name + ".jsm") + "\n");