diff options
author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-06-13 17:31:46 +0200 |
---|---|---|
committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-06-13 17:31:46 +0200 |
commit | e08b25667f20c83cd66e7f55dd98f16ae982974b (patch) | |
tree | 7a8d031f121417cb735c5c6e7bb0cec647482d26 /toolkit/content | |
parent | 27a19a14646f23194ecfe87530dd8d1d5b25fa57 (diff) | |
download | UXP-e08b25667f20c83cd66e7f55dd98f16ae982974b.tar UXP-e08b25667f20c83cd66e7f55dd98f16ae982974b.tar.gz UXP-e08b25667f20c83cd66e7f55dd98f16ae982974b.tar.lz UXP-e08b25667f20c83cd66e7f55dd98f16ae982974b.tar.xz UXP-e08b25667f20c83cd66e7f55dd98f16ae982974b.zip |
Add architecture detection to "about:" and "about:support"
Issue #492
Diffstat (limited to 'toolkit/content')
-rw-r--r-- | toolkit/content/about.js | 7 | ||||
-rw-r--r-- | toolkit/content/aboutSupport.js | 3 | ||||
-rw-r--r-- | toolkit/content/jar.mn | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/toolkit/content/about.js b/toolkit/content/about.js index c27916c10..c402ea685 100644 --- a/toolkit/content/about.js +++ b/toolkit/content/about.js @@ -33,7 +33,12 @@ var versionNum = Components.classes["@mozilla.org/xre/app-info;1"] .getService(Components.interfaces.nsIXULAppInfo) .version; var version = document.getElementById("version"); -version.textContent += " " + versionNum; +#ifdef HAVE_64BIT_BUILD +var versionStr = versionNum + " (64-bit)"; +#else +var versionStr = versionNum + " (32-bit)"; +#endif +version.textContent += " " + versionStr; // insert the buildid of the XUL application var BuildIDVal = Components.classes["@mozilla.org/xre/app-info;1"] diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js index 7209b7ad0..016549f43 100644 --- a/toolkit/content/aboutSupport.js +++ b/toolkit/content/aboutSupport.js @@ -42,6 +42,9 @@ var snapshotFormatters = { $("os-box").textContent = data.osVersion; $("supportLink").href = data.supportURL; let version = AppConstants.MOZ_APP_VERSION_DISPLAY; + if (data.versionArch) { + version += " (" + data.versionArch + ")"; + } if (data.vendor) version += " (" + data.vendor + ")"; $("version-box").textContent = version; diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index 72a7952c4..a5db7e3a1 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -8,7 +8,7 @@ toolkit.jar: content/global/textbox.css content/global/menulist.css content/global/autocomplete.css - content/global/about.js +* content/global/about.js content/global/about.xhtml content/global/aboutAbout.js content/global/aboutAbout.xhtml |