gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-17 06:05:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix :version for non-XPI installs. Fix :extensions in FF 3.6.

Browse Source
This commit is contained in:
Kris Maglione
2010-09-18 07:24:35 -04:00
parent ce179ee3b6
commit a53edafac1
12 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/Makefile
View File

@@ -6,6 +6,7 @@ BUILD_DATE = $(shell date "+%Y/%m/%d %H:%M:%S")
BASE = $(TOP)/../common
GOOGLE_PROJ = dactyl
GOOGLE = https://$(GOOGLE_PROJ).googlecode.com/files
VERSION = $(shell sed -n 's/.*<em:version>\(.*\)<.*/\1/p' $(TOP)/install.rdf)
LOCALEDIR = locale
DOC_FILES = $(wildcard $(LOCALEDIR)/*/*.xml)

1
common/components/protocols.js
View File

@@ -114,6 +114,7 @@ function Dactyl() {
this.HELP_TAGS = {};
this.FILE_MAP = {};
this.OVERLAY_MAP = {};
this.addonID = this.name + "@dactyl.googlecode.com";
}
Dactyl.prototype = {
contractID: "@mozilla.org/network/protocol;1?name=dactyl",

20
common/content/dactyl.js
View File

@@ -72,7 +72,7 @@ const Dactyl = Module("dactyl", {
forceNewWindow: false,
/** @property {string} The Dactyl version string. */
version: "@VERSION@ (created: @DATE@)", // these VERSION and DATE tokens are replaced by the Makefile
version: null,
/**
* @property {Object} The map of command-line options. These are
@@ -1421,12 +1421,14 @@ const Dactyl = Module("dactyl", {
if (typeof AddonManager == "undefined")
modules.AddonManager = {
getAddonById: function (id, callback) {
getAddonByID: function (id, callback) {
callback = callback || util.identity;
let addon = id;
if (!isobject(addon))
addon = services.get("extensionManager").getItemForID(id);
if (!addon)
return callback(null);
addon = Object.create(addon);
function getRdfProperty(item, property) {
let resource = services.get("rdf").GetResource("urn:mozilla:item:" + item.id);
@@ -1444,7 +1446,7 @@ const Dactyl = Module("dactyl", {
["aboutURL", "creator", "description", "developers",
"homepageURL", "iconURL", "installDate", "name",
"optionsURL", "releaseNotesURI", "updateDate"].forEach(function (item) {
"optionsURL", "releaseNotesURI", "updateDate", "version"].forEach(function (item) {
addon[item] = getRdfProperty(addon, item);
});
addon.isActive = getRdfProperty(addon, "isDisabled") != "true";
@@ -1453,7 +1455,7 @@ const Dactyl = Module("dactyl", {
services.get("extensionManager").uninstallItem(this.id);
};
addon.appDisabled = false;
addon.__defineGetter("userDisabled", function() getRdfProperty("userDisabled") == "true");
addon.__defineGetter__("userDisabled", function() getRdfProperty("userDisabled") == "true");
addon.__defineSetter__("userDisabled", function(val) {
services.get("extensionManager")[val ? "enableItem" : "disableItem"](this.id);
});
@@ -1465,8 +1467,8 @@ const Dactyl = Module("dactyl", {
for (let [,type] in Iterator(types))
for (let [,item] in Iterator(services.get("extensionManager")
.getItemList(Ci.nsIUpdateItem["TYPE_" + type.toUpperCase()], {})))
res.append(this.getAddonById(item));
return res;
res.push(this.getAddonByID(item));
callback(res);
},
getInstallForFile: function (file, callback, mimetype) {
callback({
@@ -1975,6 +1977,12 @@ const Dactyl = Module("dactyl", {
dactyl.log("All modules loaded", 3);
AddonManager.getAddonByID(services.get("dactyl:").addonID, function (addon) {
// @DATE@ token replaced by the Makefile
// TODO: Find it automatically
dactyl.version = addon.version + " (created: @DATE@)";
});
services.add("commandLineHandler", "@mozilla.org/commandlinehandler/general-startup;1?type=" + config.name);
let commandline = services.get("commandLineHandler").optionValue;