wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-27 10:57:34 +09:00
Code Issues Projects Releases Packages Wiki Activity

Add architecture detection to "about:" and "about:support"

Browse source 
Issue #492
This commit is contained in:
janekptacijarabaci 2018-06-13 17:31:46 +02:00 • committed by Roy Tam
commit 63ad437c13
6 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
toolkit/content/about.js
View file

@ -33,7 +33,12 @@ var versionNum = Components.classes["@mozilla.org/xre/app-info;1"]
.getService(Components.interfaces.nsIXULAppInfo) .getService(Components.interfaces.nsIXULAppInfo)
.version; .version;
var version = document.getElementById("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 // insert the buildid of the XUL application
var BuildIDVal = Components.classes["@mozilla.org/xre/app-info;1"] var BuildIDVal = Components.classes["@mozilla.org/xre/app-info;1"]

3
toolkit/content/aboutSupport.js
View file

@ -42,6 +42,9 @@ var snapshotFormatters = {
$("os-box").textContent = data.osVersion; $("os-box").textContent = data.osVersion;
$("supportLink").href = data.supportURL; $("supportLink").href = data.supportURL;
let version = AppConstants.MOZ_APP_VERSION_DISPLAY; let version = AppConstants.MOZ_APP_VERSION_DISPLAY;
if (data.versionArch) {
version += " (" + data.versionArch + ")";
}
if (data.vendor) if (data.vendor)
version += " (" + data.vendor + ")"; version += " (" + data.vendor + ")";
$("version-box").textContent = version; $("version-box").textContent = version;

2
toolkit/content/jar.mn
View file

@ -8,7 +8,7 @@ toolkit.jar:
content/global/textbox.css content/global/textbox.css
content/global/menulist.css content/global/menulist.css
content/global/autocomplete.css content/global/autocomplete.css
content/global/about.js * content/global/about.js
content/global/about.xhtml content/global/about.xhtml
content/global/aboutAbout.js content/global/aboutAbout.js
content/global/aboutAbout.xhtml content/global/aboutAbout.xhtml

2
toolkit/locales/en-US/chrome/global/about.dtd
View file

@ -1,7 +1,7 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public <!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!ENTITY about.version "Version"> <!ENTITY about.version "Version:">
<!-- LOCALIZATION NOTE (about.credits.beforeLink): note that there is no space between this phrase and the linked about.credits.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. --> <!-- LOCALIZATION NOTE (about.credits.beforeLink): note that there is no space between this phrase and the linked about.credits.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
<!ENTITY about.credits.beforeLink "See a list of "> <!ENTITY about.credits.beforeLink "See a list of ">

6
toolkit/modules/Troubleshoot.jsm
View file

@ -188,6 +188,12 @@ var dataProviders = {
if (AppConstants.MOZ_UPDATER) if (AppConstants.MOZ_UPDATER)
data.updateChannel = Cu.import("resource://gre/modules/UpdateUtils.jsm", {}).UpdateUtils.UpdateChannel; data.updateChannel = Cu.import("resource://gre/modules/UpdateUtils.jsm", {}).UpdateUtils.UpdateChannel;
#ifdef HAVE_64BIT_BUILD
data.versionArch = "64-bit";
#else
data.versionArch = "32-bit";
#endif
try { try {
data.vendor = Services.prefs.getCharPref("app.support.vendor"); data.vendor = Services.prefs.getCharPref("app.support.vendor");
} }

6
toolkit/modules/moz.build
View file

@ -94,7 +94,6 @@ EXTRA_JS_MODULES += [
'Sqlite.jsm', 'Sqlite.jsm',
'Task.jsm', 'Task.jsm',
'Timer.jsm', 'Timer.jsm',
'Troubleshoot.jsm',
'UpdateUtils.jsm', 'UpdateUtils.jsm',
'WebChannel.jsm', 'WebChannel.jsm',
'WindowDraggingUtils.jsm', 'WindowDraggingUtils.jsm',
@ -103,7 +102,10 @@ EXTRA_JS_MODULES += [
EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js'] EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js']
EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm'] EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm']
EXTRA_PP_JS_MODULES += ['NewTabUtils.jsm'] EXTRA_PP_JS_MODULES += [
'NewTabUtils.jsm',
'Troubleshoot.jsm',
]
if not CONFIG['MOZ_WEBEXTENSIONS']: if not CONFIG['MOZ_WEBEXTENSIONS']:
EXTRA_PP_JS_MODULES += ['UpdateChannel.jsm'] EXTRA_PP_JS_MODULES += ['UpdateChannel.jsm']