mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
partly revert "Bug 1161183: Don't show the add-on version in the list view. r=dao"
This commit is contained in:
@@ -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,
|
||||
#detail-view[type="experiment"] .alert-container,
|
||||
#detail-view[type="experiment"] #detail-version,
|
||||
#detail-view[type="experiment"] #detail-creator {
|
||||
|
||||
@@ -854,6 +854,7 @@
|
||||
<xul:hbox class="name-container">
|
||||
<xul:label anonid="name" class="name" crop="end" flex="1"
|
||||
tooltip="addonitem-tooltip" xbl:inherits="value=name"/>
|
||||
<xul:label anonid="version" class="version"/>
|
||||
<xul:label class="nativeIndicator nativeAddon" value="●" tooltiptext="&addon.nativeAddon;"/>
|
||||
<xul:label class="nativeIndicator compatAddon" value="●" tooltiptext="&addon.compatAddon;"/>
|
||||
<xul:label class="disabled-postfix" value="&addon.disabled.postfix;"/>
|
||||
@@ -1038,6 +1039,9 @@
|
||||
document.getAnonymousElementByAttribute(this, "anonid",
|
||||
"info");
|
||||
</field>
|
||||
<field name="_version">
|
||||
document.getAnonymousElementByAttribute(this, "anonid", "version");
|
||||
</field>
|
||||
<field name="_experimentState">
|
||||
document.getAnonymousElementByAttribute(this, "anonid", "experiment-state");
|
||||
</field>
|
||||
@@ -1174,6 +1178,11 @@
|
||||
else
|
||||
this._icon.src = "";
|
||||
|
||||
if (shouldShowVersionNumber(this.mAddon))
|
||||
this._version.value = this.mAddon.version;
|
||||
else
|
||||
this._version.hidden = true;
|
||||
|
||||
if (this.mAddon.description)
|
||||
this._description.value = this.mAddon.description;
|
||||
else
|
||||
@@ -1462,6 +1471,14 @@
|
||||
]]></body>
|
||||
</method>
|
||||
|
||||
<method name="_updateUpgradeInfo">
|
||||
<body><![CDATA[
|
||||
// Only update the version string if we're displaying the upgrade info
|
||||
if (this.hasAttribute("upgrade") && shouldShowVersionNumber(this.mAddon))
|
||||
this._version.value = this.mManualUpdate.version;
|
||||
]]></body>
|
||||
</method>
|
||||
|
||||
<method name="_fetchReleaseNotes">
|
||||
<parameter name="aURI"/>
|
||||
<body><![CDATA[
|
||||
@@ -1752,6 +1769,7 @@
|
||||
|
||||
this.mManualUpdate = aInstall;
|
||||
this._showStatus("update-available");
|
||||
this._updateUpgradeInfo();
|
||||
]]></body>
|
||||
</method>
|
||||
|
||||
@@ -1954,6 +1972,7 @@
|
||||
<xul:vbox class="fade name-outer-container" flex="1">
|
||||
<xul:hbox class="name-container">
|
||||
<xul:label anonid="name" class="name" crop="end" tooltip="addonitem-tooltip"/>
|
||||
<xul:label anonid="version" class="version" hidden="true"/>
|
||||
</xul:hbox>
|
||||
</xul:vbox>
|
||||
<xul:vbox class="install-status-container">
|
||||
@@ -1975,6 +1994,9 @@
|
||||
<field name="_name">
|
||||
document.getAnonymousElementByAttribute(this, "anonid", "name");
|
||||
</field>
|
||||
<field name="_version">
|
||||
document.getAnonymousElementByAttribute(this, "anonid", "version");
|
||||
</field>
|
||||
<field name="_warning">
|
||||
document.getAnonymousElementByAttribute(this, "anonid", "warning");
|
||||
</field>
|
||||
@@ -2002,6 +2024,14 @@
|
||||
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
|
||||
@@ -2015,6 +2045,13 @@
|
||||
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) {
|
||||
|
||||
Reference in New Issue
Block a user