diff options
author | Kris Maglione <maglione.k@gmail.com> | 2011-01-17 22:06:03 -0500 |
---|---|---|
committer | Kris Maglione <maglione.k@gmail.com> | 2011-01-17 22:06:03 -0500 |
commit | 74d00cd2225b71c8cdf86599386b96bb11e30138 (patch) | |
tree | 00c5eb0fb1b24862f0fd2be285ed1fd48d623875 /common | |
parent | b1cd1c7dbf9cfba06f2f9b1684a39a24ba755708 (diff) | |
download | pentadactyl-74d00cd2225b71c8cdf86599386b96bb11e30138.tar.gz |
Fix FF36.
Diffstat (limited to 'common')
-rw-r--r-- | common/components/protocols.js | 2 | ||||
-rw-r--r-- | common/modules/bootstrap.jsm | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/common/components/protocols.js b/common/components/protocols.js index 42ef14de..20792f5a 100644 --- a/common/components/protocols.js +++ b/common/components/protocols.js @@ -116,6 +116,8 @@ function Dactyl() { this.pages = {}; Cu.import("resource://dactyl/bootstrap.jsm"); + if (!JSMLoader.initialized) + JSMLoader.init(); JSMLoader.load("base.jsm", global); require(global, "config"); require(global, "services"); diff --git a/common/modules/bootstrap.jsm b/common/modules/bootstrap.jsm index b890dff1..1d2a3110 100644 --- a/common/modules/bootstrap.jsm +++ b/common/modules/bootstrap.jsm @@ -28,6 +28,7 @@ if (!JSMLoader || JSMLoader.bump != 3) storage: storage, suffix: "", init: function init(suffix) { + this.initialized = true; this.suffix = suffix || ""; this.storage.set("dactyl.JSMLoader", this); |