From d9fb4e872d5328236ade9be922409c6917509403 Mon Sep 17 00:00:00 2001 From: Mathwi <36977069+Mathwi@users.noreply.github.com> Date: Sat, 16 Nov 2019 17:15:39 -0600 Subject: [PATCH] Hidden preference to toggle addon version in addon manager (#10) (#9) 1. Restore add-on version numbers 2. Hidden preference to toggle add-on version in add-on manager Puts Show add-on version in add-on manager add-on list behind user preference "extensions.addonVersionInfo", currently on by default (Change ported from Waterfox) --- .../mozapps/extensions/content/extensions.xml | 3 +- .../webextensions/content/extensions.css | 1 + .../webextensions/content/extensions.xml | 35 +++++++++++++++++-- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/extensions/content/extensions.xml index 9c8fda8ed9..7c8fab723f 100644 --- a/toolkit/mozapps/extensions/content/extensions.xml +++ b/toolkit/mozapps/extensions/content/extensions.xml @@ -1174,7 +1174,8 @@ else this._icon.src = ""; - if (shouldShowVersionNumber(this.mAddon)) + if (shouldShowVersionNumber(this.mAddon) && + Services.prefs.getBoolPref("extensions.addonVersionInfo", true)) this._version.value = this.mAddon.version; else this._version.hidden = true; diff --git a/toolkit/mozapps/webextensions/content/extensions.css b/toolkit/mozapps/webextensions/content/extensions.css index cb5313365f..2b7994d747 100644 --- a/toolkit/mozapps/webextensions/content/extensions.css +++ b/toolkit/mozapps/webextensions/content/extensions.css @@ -249,6 +249,7 @@ richlistitem:not([selected]) * { .view-pane[type="experiment"] .addon:not([pending="uninstall"]) .pending, .view-pane[type="experiment"] .disabled-postfix, .view-pane[type="experiment"] .update-postfix, +.view-pane[type="experiment"] .version, .view-pane[type="experiment"] .addon-control.enable, .view-pane[type="experiment"] .addon-control.disable, #detail-view[type="experiment"] .alert-container, diff --git a/toolkit/mozapps/webextensions/content/extensions.xml b/toolkit/mozapps/webextensions/content/extensions.xml index b49645cf0a..3addc8e6a7 100644 --- a/toolkit/mozapps/webextensions/content/extensions.xml +++ b/toolkit/mozapps/webextensions/content/extensions.xml @@ -808,6 +808,7 @@ + @@ -986,6 +987,9 @@ document.getAnonymousElementByAttribute(this, "anonid", "info"); + + document.getAnonymousElementByAttribute(this, "anonid", "version"); + document.getAnonymousElementByAttribute(this, "anonid", "experiment-state"); @@ -1117,7 +1121,11 @@ this._icon.src = iconURL; else this._icon.src = ""; - + if (shouldShowVersionNumber(this.mAddon) && + Services.prefs.getBoolPref("extensions.addonVersionInfo", true)) + this._version.value = this.mAddon.version; + else + this._version.hidden = true; if (this.mAddon.description) this._description.value = this.mAddon.description; else @@ -1402,7 +1410,13 @@ } ]]> - + + + @@ -1891,6 +1906,7 @@ + @@ -1912,6 +1928,9 @@ document.getAnonymousElementByAttribute(this, "anonid", "name"); + + document.getAnonymousElementByAttribute(this, "anonid", "version"); + document.getAnonymousElementByAttribute(this, "anonid", "warning"); @@ -1939,6 +1958,12 @@ this._icon.src = this.mAddon.iconURL || (this.mInstall ? this.mInstall.iconURL : ""); this._name.value = this.mAddon.name; + if (this.mAddon.version) { + this._version.value = this.mAddon.version; + this._version.hidden = false; + } else { + this._version.hidden = true; + } } else { this._icon.src = this.mInstall.iconURL; // AddonInstall.name isn't always available - fallback to filename @@ -1952,6 +1977,12 @@ url.QueryInterface(Components.interfaces.nsIURL); this._name.value = url.fileName; } + if (this.mInstall.version) { + this._version.value = this.mInstall.version; + this._version.hidden = false; + } else { + this._version.hidden = true; + } } if (this.mInstall.state == AddonManager.STATE_DOWNLOAD_FAILED) {