summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2017-07-30 07:44:13 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-02-12 15:28:44 +0100
commit0f99df52d5309158c7b916581c5a79496b1844db (patch)
treeb27d38535f73a25c48fdaca78ffc929f567deecd
parent3adc70dadd03c444ae2ee87673f68cbf07dd060a (diff)
downloadUXP-0f99df52d5309158c7b916581c5a79496b1844db.tar
UXP-0f99df52d5309158c7b916581c5a79496b1844db.tar.gz
UXP-0f99df52d5309158c7b916581c5a79496b1844db.tar.lz
UXP-0f99df52d5309158c7b916581c5a79496b1844db.tar.xz
UXP-0f99df52d5309158c7b916581c5a79496b1844db.zip
Exclude Update stuff from about:support if the updater isn't built.
-rw-r--r--toolkit/content/aboutSupport.js19
-rw-r--r--toolkit/content/aboutSupport.xhtml2
-rw-r--r--toolkit/mozapps/update/content/history.js2
3 files changed, 13 insertions, 10 deletions
diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index 95cadfbe7..5daf6d189 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -968,31 +968,32 @@ function safeModeRestart() {
* Set up event listeners for buttons.
*/
function setupEventListeners() {
- $("show-update-history-button").addEventListener("click", function (event) {
+#ifdef MOZ_UPDATER
+ $("show-update-history-button").addEventListener("click", function(event) {
var prompter = Cc["@mozilla.org/updates/update-prompt;1"].createInstance(Ci.nsIUpdatePrompt);
prompter.showUpdateHistory(window);
});
- $("reset-box-button").addEventListener("click", function (event) {
+#endif
+ $("reset-box-button").addEventListener("click", function(event) {
ResetProfile.openConfirmationDialog(window);
});
- $("copy-raw-data-to-clipboard").addEventListener("click", function (event) {
+ $("copy-raw-data-to-clipboard").addEventListener("click", function(event) {
copyRawDataToClipboard(this);
});
- $("copy-to-clipboard").addEventListener("click", function (event) {
+ $("copy-to-clipboard").addEventListener("click", function(event) {
copyContentsToClipboard();
});
- $("profile-dir-button").addEventListener("click", function (event) {
+ $("profile-dir-button").addEventListener("click", function(event) {
openProfileDirectory();
});
- $("restart-in-safe-mode-button").addEventListener("click", function (event) {
+ $("restart-in-safe-mode-button").addEventListener("click", function(event) {
if (Services.obs.enumerateObservers("restart-in-safe-mode").hasMoreElements()) {
Services.obs.notifyObservers(null, "restart-in-safe-mode", "");
- }
- else {
+ } else {
safeModeRestart();
}
});
- $("verify-place-integrity-button").addEventListener("click", function (event) {
+ $("verify-place-integrity-button").addEventListener("click", function(event) {
PlacesDBUtils.checkAndFixDatabase(function(aLog) {
let msg = aLog.join("\n");
$("verify-place-result").style.display = "block";
diff --git a/toolkit/content/aboutSupport.xhtml b/toolkit/content/aboutSupport.xhtml
index f5939a6eb..e2885c8b8 100644
--- a/toolkit/content/aboutSupport.xhtml
+++ b/toolkit/content/aboutSupport.xhtml
@@ -99,6 +99,7 @@
</tr>
#ifndef ANDROID
+#ifdef MOZ_UPDATER
<tr class="no-copy">
<th class="column">
&aboutSupport.appBasicsUpdateHistory;
@@ -111,6 +112,7 @@
</td>
</tr>
#endif
+#endif
#ifdef MOZ_UPDATER
<tr>
diff --git a/toolkit/mozapps/update/content/history.js b/toolkit/mozapps/update/content/history.js
index 32a098de5..c5bbccefc 100644
--- a/toolkit/mozapps/update/content/history.js
+++ b/toolkit/mozapps/update/content/history.js
@@ -37,7 +37,7 @@ var gUpdateHistory = {
var element = document.createElementNS(NS_XUL, "update");
this._view.appendChild(element);
element.name = bundle.getFormattedString("updateFullName",
- [update.name, update.buildID]);
+ [update.name, (update.buildID ? update.buildID : "-")]);
element.type = bundle.getString("updateType_" + update.type);
element.installDate = this._formatDate(update.installDate);
if (update.detailsURL)