summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorKris Maglione <maglione.k@gmail.com>2011-01-13 20:04:14 -0500
committerKris Maglione <maglione.k@gmail.com>2011-01-13 20:04:14 -0500
commitd62371042cad2b36d80efb45dc88570193e2a6d4 (patch)
tree083a19ef615951f24e3428bc6c3f9d173ab5f76a /common
parent967a213019cc771e7c2745f35d89235418f96705 (diff)
downloadpentadactyl-d62371042cad2b36d80efb45dc88570193e2a6d4.tar.gz
Fix about:pentadactyl.
Diffstat (limited to 'common')
-rwxr-xr-xcommon/bootstrap.js4
-rw-r--r--common/components/protocols.js2
-rw-r--r--common/content/about.xul4
3 files changed, 4 insertions, 6 deletions
diff --git a/common/bootstrap.js b/common/bootstrap.js
index e63bc0c6..d7827dbf 100755
--- a/common/bootstrap.js
+++ b/common/bootstrap.js
@@ -63,7 +63,7 @@ function startup(data, reason) {
AddonManager.getAddonByID(addon.id, function (a) { addon = a; });
// Temporary hack.
- if (basePath.isDirectory() && JSMLoader.bump == null)
+ if (basePath.isDirectory() && global.JSMLoader && JSMLoader.bump == null)
JSMLoader.bump = 2;
if (basePath.isDirectory())
@@ -100,8 +100,6 @@ FactoryProxy.prototype = {
dump("dactyl: bootstrap: create module: " + this.contractID + "\n");
Object.defineProperty(this, "module", { value: {}, enumerable: true });
- dump("get module " + this.url + "\n");
- dump(" " + (JSMLoader.stale[this.url]) + "\n");
JSMLoader.load(this.url, this.module);
return this.module;
},
diff --git a/common/components/protocols.js b/common/components/protocols.js
index 80e7e984..539a539a 100644
--- a/common/components/protocols.js
+++ b/common/components/protocols.js
@@ -303,7 +303,7 @@ AboutHandler.prototype = {
newChannel: function (uri) {
let channel = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService)
- .newChannel("resource://dactyl-content/about.xul", null, null);
+ .newChannel("dactyl://content/about.xul", null, null);
channel.originalURI = uri;
return channel;
},
diff --git a/common/content/about.xul b/common/content/about.xul
index 00c0aba9..0d97951d 100644
--- a/common/content/about.xul
+++ b/common/content/about.xul
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://pentadactyl/skin/about.css" type="text/css"?>
-<!DOCTYPE overlay SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<?xml-stylesheet href="resource://dactyl-local-skin/about.css" type="text/css"?>
+<!DOCTYPE overlay SYSTEM "dactyl://content/dtd">
<page id="about-&dactyl.name;" orient="vertical" title="About &dactyl.appName;"
xmlns="&xmlns.xul;" xmlns:html="&xmlns.html;">