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

Bump JSMLoader.bump.

Browse Source
This commit is contained in:
Kris Maglione
2011-08-21 03:08:37 -04:00
parent af62c1a5f6
commit 9a378d467c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/bootstrap.js vendored
View File

@@ -202,12 +202,12 @@ function init() {
for (let [name] in Iterator(JSMLoader.globals)) for (let [name] in Iterator(JSMLoader.globals))
Cu.unload(~name.indexOf(":") ? name : "resource://dactyl" + JSMLoader.suffix + "/" + name); Cu.unload(~name.indexOf(":") ? name : "resource://dactyl" + JSMLoader.suffix + "/" + name);
} }
else if (JSMLoader.bump != 5) // Temporary hack else if (JSMLoader.bump != 6) // Temporary hack
Services.scriptloader.loadSubScript("resource://dactyl" + suffix + "/bootstrap.jsm", Services.scriptloader.loadSubScript("resource://dactyl" + suffix + "/bootstrap.jsm",
Cu.import(BOOTSTRAP_JSM, global)); Cu.import(BOOTSTRAP_JSM, global));
} }
if (!JSMLoader || JSMLoader.bump !== 5 || Cu.unload) if (!JSMLoader || JSMLoader.bump !== 6 || Cu.unload)
Cu.import(BOOTSTRAP_JSM, global); Cu.import(BOOTSTRAP_JSM, global);
JSMLoader.bootstrap = this; JSMLoader.bootstrap = this;

2
common/modules/protocol.jsm
View File

@@ -84,7 +84,7 @@ ProtocolBase.prototype = {
newURI: function newURI(spec, charset, baseURI) { newURI: function newURI(spec, charset, baseURI) {
if (baseURI && baseURI.host === "data") if (baseURI && baseURI.host === "data")
baseURI = null; baseURI = null;
return services.URL(services.URL.URLTYPE_STANDARD, return services.URL(services.URL.URLTYPE_AUTHORITY,
this.defaultPort, spec, charset, baseURI); this.defaultPort, spec, charset, baseURI);
}, },

2
common/modules/services.jsm
View File

@@ -81,7 +81,7 @@ var Services = Module("Services", {
this.addClass("Pipe", "@mozilla.org/pipe;1", "nsIPipe", "init"); this.addClass("Pipe", "@mozilla.org/pipe;1", "nsIPipe", "init");
this.addClass("Process", "@mozilla.org/process/util;1", "nsIProcess", "init"); this.addClass("Process", "@mozilla.org/process/util;1", "nsIProcess", "init");
this.addClass("StreamChannel","@mozilla.org/network/input-stream-channel;1", this.addClass("StreamChannel","@mozilla.org/network/input-stream-channel;1",
["nsIChannel", "nsIInputStreamChannel", "nsIRequest"], "setURI"); ["nsIInputStreamChannel", "nsIChannel"], "setURI");
this.addClass("StreamCopier", "@mozilla.org/network/async-stream-copier;1","nsIAsyncStreamCopier", "init"); this.addClass("StreamCopier", "@mozilla.org/network/async-stream-copier;1","nsIAsyncStreamCopier", "init");
this.addClass("String", "@mozilla.org/supports-string;1", "nsISupportsString", "data"); this.addClass("String", "@mozilla.org/supports-string;1", "nsISupportsString", "data");
this.addClass("StringStream", "@mozilla.org/io/string-input-stream;1", "nsIStringInputStream", "data"); this.addClass("StringStream", "@mozilla.org/io/string-input-stream;1", "nsIStringInputStream", "data");