gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-24 03:12:27 +01:00
Code Issues Projects Releases Wiki Activity

Fix some more bootstrapping update bugs.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-17 21:40:54 -05:00
parent 41441f600c
commit 35419ad234
7 changed files with 61 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/bootstrap.js vendored
View File

@@ -65,8 +65,7 @@ function startup(data, reason) {
init();
}
catch (e) {
dump("dactyl: bootstrap: " + e + "\n" + e.stack);
Cu.reportError(e);
reportError(e);
}
}
}
@@ -130,10 +129,15 @@ function init() {
}
}
dump("JSMLoader " + (typeof JSMLoader !== "undefined" && JSMLoader.bump) + "\n");
if (typeof JSMLoader === "undefined" || JSMLoader.bump != 2)
if (JSMLoader && JSMLoader.bump != 3) // Temporary hack
Services.scriptloader.loadSubScript("resource://dactyl" + suffix + "/bootstrap.jsm",
Cu.import("resource://dactyl/bootstrap.jsm", global));
if (!JSMLoader || JSMLoader.bump != 3)
Cu.import("resource://dactyl/bootstrap.jsm", global);
JSMLoader.load("resource://dactyl/bootstrap.jsm", global);
JSMLoader.init(suffix);
JSMLoader.load("base.jsm", global);