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

Fix error thrown in protocols.js.

Browse Source
This commit is contained in:
Kris Maglione
2010-12-28 20:45:00 -05:00
parent f330440138
commit cd21743661
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/components/protocols.js
View File

@@ -27,7 +27,7 @@ function dataURL(type, data) "data:" + (type || "application/xml;encoding=UTF-8"
function makeChannel(url, orig) { function makeChannel(url, orig) {
try { try {
if (url == null) if (url == null)
return fakeChannel(); return fakeChannel(orig);
if (typeof url === "function") if (typeof url === "function")
url = dataURL.apply(null, url()); url = dataURL.apply(null, url());
let uri = ioService.newURI(url, null, null); let uri = ioService.newURI(url, null, null);
@@ -38,7 +38,7 @@ function makeChannel(url, orig) {
return channel; return channel;
} }
catch (e) { catch (e) {
Components.utils.reportError(e); util.reportError(e);
throw e; throw e;
} }
} }
@@ -87,7 +87,7 @@ ChromeData.prototype = {
return makeChannel(uri.spec.replace(/^.*?:\/*(.*)(?:#.*)?/, "data:$1"), uri); return makeChannel(uri.spec.replace(/^.*?:\/*(.*)(?:#.*)?/, "data:$1"), uri);
} }
catch (e) {} catch (e) {}
return fakeChannel(); return fakeChannel(uri);
} }
}; };
@@ -102,6 +102,7 @@ function Dactyl() {
Cu.import("resource://dactyl/base.jsm"); Cu.import("resource://dactyl/base.jsm");
require(global, "prefs"); require(global, "prefs");
require(global, "util");
["appName", "fileExt", "host", "hostbin", "idName", "name", "version"].forEach(function (pref) ["appName", "fileExt", "host", "hostbin", "idName", "name", "version"].forEach(function (pref)
this.__defineGetter__(pref, function () prefs.get("extensions.dactyl." + pref, "dactyl")), this.__defineGetter__(pref, function () prefs.get("extensions.dactyl." + pref, "dactyl")),
@@ -132,7 +133,7 @@ Dactyl.prototype = {
| Ci.nsIProtocolHandler.URI_IS_UI_RESOURCE | Ci.nsIProtocolHandler.URI_IS_UI_RESOURCE
| Ci.nsIProtocolHandler.URI_IS_LOCAL_RESOURCE, | Ci.nsIProtocolHandler.URI_IS_LOCAL_RESOURCE,
newURI: function (spec, charset, baseURI) { newURI: function newURI(spec, charset, baseURI) {
var uri = Cc["@mozilla.org/network/standard-url;1"] var uri = Cc["@mozilla.org/network/standard-url;1"]
.createInstance(Ci.nsIStandardURL) .createInstance(Ci.nsIStandardURL)
.QueryInterface(Ci.nsIURI); .QueryInterface(Ci.nsIURI);
@@ -140,7 +141,7 @@ Dactyl.prototype = {
return uri; return uri;
}, },
newChannel: function (uri) { newChannel: function newChannel(uri) {
try { try {
if (uri.host != "content" && !("all" in this.FILE_MAP)) if (uri.host != "content" && !("all" in this.FILE_MAP))
return redirect(uri.spec, uri, 1); return redirect(uri.spec, uri, 1);
@@ -171,7 +172,7 @@ Dactyl.prototype = {
entry: "m-dactyl" entry: "m-dactyl"
}], }],
observe: function (subject, topic, data) { observe: function observe(subject, topic, data) {
if (topic === "profile-after-change") { if (topic === "profile-after-change") {
Cu.import("resource://dactyl/base.jsm"); Cu.import("resource://dactyl/base.jsm");
require(global, "overlay"); require(global, "overlay");