diff --git a/common/bootstrap.js b/common/bootstrap.js index 9ce8dec5..1d2577a1 100755 --- a/common/bootstrap.js +++ b/common/bootstrap.js @@ -148,7 +148,7 @@ function init() { case "resource": let str = "dactyl-"; if (fields[1].indexOf(str) == 0) - var prefix = fields[1].substr(str.length); + var suffix = fields[1].substr(str.length - 1); resourceProto.setSubstitution(fields[1], getURI(fields[2])); } @@ -161,6 +161,9 @@ function init() { JSMLoader.load("resource://dactyl/bootstrap.jsm", global); } + if (suffix) + JSMLoader.suffix = suffix; + for each (let component in components) component.register(); diff --git a/common/modules/bootstrap.jsm b/common/modules/bootstrap.jsm index 19c44594..c8b79a02 100644 --- a/common/modules/bootstrap.jsm +++ b/common/modules/bootstrap.jsm @@ -30,9 +30,9 @@ if (!JSMLoader || JSMLoader.bump != 1) url = "resource://dactyl" + this.suffix + "/" + url; let stale = this.stale[url]; - dump("JSMLoader: load " + name + " " + stale + "\n"); - dump("JSMLoader: load " + name + " " + this.getTarget(url) + "\n"); if (stale) { + dump("JSMLoader: load " + name + " " + stale + "\n"); + dump("JSMLoader: load " + name + " " + this.getTarget(url) + "\n"); delete this.stale[url]; let global = this.globals[url]; @@ -51,7 +51,6 @@ if (!JSMLoader || JSMLoader.bump != 1) Components.classes["@mozilla.org/moz/jssubscript-loader;1"] .getService(Components.interfaces.mozIJSSubScriptLoader) .loadSubScript(url, global.global || global); - dump("JSMLoader: load " + name + " " + global.EXPORTED_SYMBOLS + "\n"); } let global = Components.utils.import(url, target);