diff options
| author | Kris Maglione <maglione.k@gmail.com> | 2011-08-15 01:22:50 -0400 |
|---|---|---|
| committer | Kris Maglione <maglione.k@gmail.com> | 2011-08-15 01:22:50 -0400 |
| commit | 9d87ed9454e5bd9950b70dd6171c7f8b2bcf955e (patch) | |
| tree | a280e0b12a619b227b71460ace743798ad9c1c02 /common/modules | |
| parent | 07d6099a953c1367efdc57eb141f5a973e843aec (diff) | |
| download | pentadactyl-9d87ed9454e5bd9950b70dd6171c7f8b2bcf955e.tar.gz | |
Fix :rehash.
Diffstat (limited to 'common/modules')
| -rw-r--r-- | common/modules/base.jsm | 5 | ||||
| -rw-r--r-- | common/modules/overlay.jsm | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/common/modules/base.jsm b/common/modules/base.jsm index 7bd4e1cd..047bb6fd 100644 --- a/common/modules/base.jsm +++ b/common/modules/base.jsm @@ -202,7 +202,7 @@ function require(obj, name, from) { let caller = Components.stack.caller; if (!loaded[name]) - defineModule.loadLog.push((from || "require") + ": loading " + name + " into " + (obj.NAME || caller.filename + ":" + caller.lineNumber)); + defineModule.loadLog.push(" " + (from || "require") + ": loading " + name + " into " + (obj.NAME || caller.filename + ":" + caller.lineNumber)); JSMLoader.load(name + ".jsm", obj); return obj; @@ -1069,8 +1069,9 @@ function Module(name, prototype) { let proto = arguments[callable(prototype) ? 2 : 1]; proto._metaInit_ = function () { + dump("_metaInit_ " + name + " " + currentModule.NAME + " " + this + "\n"); delete module.prototype._metaInit_; - currentModule[name.toLowerCase()] = instance; + currentModule[name.toLowerCase()] = this; }; const module = Class.apply(Class, Array.slice(arguments, 0, init)); diff --git a/common/modules/overlay.jsm b/common/modules/overlay.jsm index 587ee7f8..788c923d 100644 --- a/common/modules/overlay.jsm +++ b/common/modules/overlay.jsm @@ -45,6 +45,10 @@ var Overlay = Module("Overlay", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReferen config.loadStyles(); + this.timeout(this.initialize); + }, + + initialize: function () { this.overlayWindow(config.overlayChrome, function _overlay(window) ({ init: function onInit(document) { /** |