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

Fix forseeable problem with last commit.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-19 18:28:27 -05:00
parent 0de541726b
commit b648a061c8
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/bootstrap.js vendored
View File

@@ -36,7 +36,7 @@ try { // Temporary migration code.
catch (e) {} catch (e) {}
const BOOTSTRAP_CONTRACT = "@dactyl.googlecode.com/base/bootstrap"; const BOOTSTRAP_CONTRACT = "@dactyl.googlecode.com/base/bootstrap";
JSMLoader = JSMLoader || BOOTSTRAP_CONTRACT in Cc && Cc[BOOTSTRAP_CONTRACT].getService().wrappedJSObject; JSMLoader = JSMLoader || BOOTSTRAP_CONTRACT in Cc && Cc[BOOTSTRAP_CONTRACT].getService().wrappedJSObject.loader;
function reportError(e) { function reportError(e) {
dump("\ndactyl: bootstrap: " + e + "\n" + (e.stack || Error().stack) + "\n"); dump("\ndactyl: bootstrap: " + e + "\n" + (e.stack || Error().stack) + "\n");
@@ -203,11 +203,13 @@ function init() {
instance: { instance: {
QueryInterface: XPCOMUtils.generateQI([]), QueryInterface: XPCOMUtils.generateQI([]),
contractID: BOOTSTRAP_CONTRACT, contractID: BOOTSTRAP_CONTRACT,
wrappedJSObject: JSMLoader wrappedJSObject: {}
}, },
createInstance: function () this.instance createInstance: function () this.instance
}) })
Cc[BOOTSTRAP_CONTRACT].getService().wrappedJSObject.loader = JSMLoader;
for each (let component in components) for each (let component in components)
component.register(); component.register();

2
common/modules/bootstrap.jsm
View File

@@ -11,7 +11,7 @@ var global = this;
var BOOTSTRAP_CONTRACT = "@dactyl.googlecode.com/base/bootstrap"; var BOOTSTRAP_CONTRACT = "@dactyl.googlecode.com/base/bootstrap";
var JSMLoader = BOOTSTRAP_CONTRACT in Components.classes && var JSMLoader = BOOTSTRAP_CONTRACT in Components.classes &&
Components.classes[BOOTSTRAP_CONTRACT].getService().wrappedJSObject; Components.classes[BOOTSTRAP_CONTRACT].getService().wrappedJSObject.loader;
if (!JSMLoader || JSMLoader.bump != 4) if (!JSMLoader || JSMLoader.bump != 4)
JSMLoader = { JSMLoader = {