1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-20 23:47:58 +01:00

Fix about:pentadactyl.

This commit is contained in:
Kris Maglione
2011-01-13 20:04:14 -05:00
parent 967a213019
commit d62371042c
3 changed files with 4 additions and 6 deletions

4
common/bootstrap.js vendored
View File

@@ -63,7 +63,7 @@ function startup(data, reason) {
AddonManager.getAddonByID(addon.id, function (a) { addon = a; }); AddonManager.getAddonByID(addon.id, function (a) { addon = a; });
// Temporary hack. // Temporary hack.
if (basePath.isDirectory() && JSMLoader.bump == null) if (basePath.isDirectory() && global.JSMLoader && JSMLoader.bump == null)
JSMLoader.bump = 2; JSMLoader.bump = 2;
if (basePath.isDirectory()) if (basePath.isDirectory())
@@ -100,8 +100,6 @@ FactoryProxy.prototype = {
dump("dactyl: bootstrap: create module: " + this.contractID + "\n"); dump("dactyl: bootstrap: create module: " + this.contractID + "\n");
Object.defineProperty(this, "module", { value: {}, enumerable: true }); 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); JSMLoader.load(this.url, this.module);
return this.module; return this.module;
}, },

View File

@@ -303,7 +303,7 @@ AboutHandler.prototype = {
newChannel: function (uri) { newChannel: function (uri) {
let channel = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService) 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; channel.originalURI = uri;
return channel; return channel;
}, },

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://pentadactyl/skin/about.css" type="text/css"?> <?xml-stylesheet href="resource://dactyl-local-skin/about.css" type="text/css"?>
<!DOCTYPE overlay SYSTEM "chrome://dactyl/content/dactyl.dtd"> <!DOCTYPE overlay SYSTEM "dactyl://content/dtd">
<page id="about-&dactyl.name;" orient="vertical" title="About &dactyl.appName;" <page id="about-&dactyl.name;" orient="vertical" title="About &dactyl.appName;"
xmlns="&xmlns.xul;" xmlns:html="&xmlns.html;"> xmlns="&xmlns.xul;" xmlns:html="&xmlns.html;">