gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-07 10:55:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge default.

Browse Source 
--HG--
branch : groups
This commit is contained in:
Kris Maglione
2011-02-07 01:09:33 -05:00
parent 9189715e9c
commit 76aaf150fa
5 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/modules/base.jsm
View File

@@ -1012,7 +1012,7 @@ var Timer = Class("Timer", {
notify: function (timer, force) {
try {
if (util.rehashing || typeof util === "undefined" || !force && this.doneAt == 0)
if (loaded.util && util.rehashing || typeof util === "undefined" || !force && this.doneAt == 0)
return;
this._timer.cancel();

2
common/modules/javascript.jsm
View File

@@ -36,6 +36,8 @@ var JavaScript = Module("javascript", {
},
}),
lazyInit: true,
newContext: function () this.modules.newContext(this.modules.userContext),
get completers() JavaScript.completers, // For backward compatibility

18
common/modules/overlay.jsm
View File

@@ -291,18 +291,18 @@ var Overlay = Module("Overlay", {
});
});
function frob(name) {
// util.dump(" ======================== FROB " + name + " ======================== ");
(deferredInit[name] || []).forEach(call);
}
function frob(name) { (deferredInit[name] || []).forEach(call); }
frob("init");
defineModule.modules.forEach(function ({ constructor: { className } }) {
modules.__defineGetter__(className, function () {
delete modules[className];
defineModule.modules.forEach(function ({ lazyInit, constructor: { className } }) {
if (!lazyInit)
frob(className);
return modules[className] = modules[className];
});
else
modules.__defineGetter__(className, function () {
delete modules[className];
frob(className);
return modules[className] = modules[className];
});
});
// Module.list.forEach(load);