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

Tie up some, but not nearly all, of the loose ends that were accidentally committed in revision 185600dddcf7.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-10 21:04:48 -05:00
parent fda5f5827b
commit 96350d49be
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/bootstrap.js vendored
View File

@@ -148,7 +148,7 @@ function init() {
case "resource": case "resource":
let str = "dactyl-"; let str = "dactyl-";
if (fields[1].indexOf(str) == 0) 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])); resourceProto.setSubstitution(fields[1], getURI(fields[2]));
} }
@@ -161,6 +161,9 @@ function init() {
JSMLoader.load("resource://dactyl/bootstrap.jsm", global); JSMLoader.load("resource://dactyl/bootstrap.jsm", global);
} }
if (suffix)
JSMLoader.suffix = suffix;
for each (let component in components) for each (let component in components)
component.register(); component.register();

5
common/modules/bootstrap.jsm
View File

@@ -30,9 +30,9 @@ if (!JSMLoader || JSMLoader.bump != 1)
url = "resource://dactyl" + this.suffix + "/" + url; url = "resource://dactyl" + this.suffix + "/" + url;
let stale = this.stale[url]; let stale = this.stale[url];
dump("JSMLoader: load " + name + " " + stale + "\n");
dump("JSMLoader: load " + name + " " + this.getTarget(url) + "\n");
if (stale) { if (stale) {
dump("JSMLoader: load " + name + " " + stale + "\n");
dump("JSMLoader: load " + name + " " + this.getTarget(url) + "\n");
delete this.stale[url]; delete this.stale[url];
let global = this.globals[url]; let global = this.globals[url];
@@ -51,7 +51,6 @@ if (!JSMLoader || JSMLoader.bump != 1)
Components.classes["@mozilla.org/moz/jssubscript-loader;1"] Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
.getService(Components.interfaces.mozIJSSubScriptLoader) .getService(Components.interfaces.mozIJSSubScriptLoader)
.loadSubScript(url, global.global || global); .loadSubScript(url, global.global || global);
dump("JSMLoader: load " + name + " " + global.EXPORTED_SYMBOLS + "\n");
} }
let global = Components.utils.import(url, target); let global = Components.utils.import(url, target);