suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor word plugin installer

Browse Source
This commit is contained in:
Adomas Venčkauskas 2018-04-03 13:32:23 +03:00
parent d4fce3c855
commit 21fadee7bb
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
resource/word-processor-plugin-installer.js
View File

@ -68,7 +68,7 @@ var ZoteroPluginInstaller = function(addon, failSilently, force) {
Zotero.debug("PluginInstaller: fetching addon info"); Zotero.debug("PluginInstaller: fetching addon info");
AddonManager.getAddonsByIDs(extensionIDs, function(addons) { AddonManager.getAddonsByIDs(extensionIDs, function(addons) {
Zotero.debug("PluginInstaller: addon info fetched"); Zotero.debug("PluginInstaller: addon info fetched");
me._addons = addons; me._addonInfo = addons[0];
me._addonInfoAvailable(); me._addonInfoAvailable();
}); });
}; };
@ -78,7 +78,7 @@ ZoteroPluginInstaller.prototype = {
_addonInfoAvailable: function() { _addonInfoAvailable: function() {
try { try {
this._version = this._addons[0].version; this._version = this._addonInfo.version;
try { try {
this._addon.verifyNotCorrupt(this); this._addon.verifyNotCorrupt(this);
@ -127,19 +127,8 @@ ZoteroPluginInstaller.prototype = {
}, },
getAddonPath: function(addonID) { getAddonPath: function(addonID) {
if(AddonManager) { return this._addonInfo.getResourceURI().
for (var addon of this._addons) { QueryInterface(Components.interfaces.nsIFileURL).file;
if(addon && addon.id == addonID) {
return addon.getResourceURI().
QueryInterface(Components.interfaces.nsIFileURL).file;
}
}
} else {
return Components.classes["@mozilla.org/extensions/manager;1"].
getService(Components.interfaces.nsIExtensionManager).
getInstallLocation(addonID).
getItemLocation(addonID);
}
}, },
setProgressWindowLabel: function(value) { setProgressWindowLabel: function(value) {