Korbs/LibreWolf
0
Fork 0
mirror of https://codeberg.org/librewolf/source.git synced 2025-01-03 03:10:07 -05:00
Code Issues Activity

fix console errors

Browse source
This commit is contained in:
Malte Jürgens 2022-01-02 12:13:35 +01:00
parent de99327b43
commit 55966bbd93
No known key found for this signature in database
GPG key ID: D29FBD5F93C0CFC3
2 changed files with 82 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

201
themes/browser/base/content/aboutDialog.js
View file

@ -2,123 +2,86 @@
* 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/. */
"use strict"; "use strict";
/* import-globals-from aboutDialog-appUpdater.js */ /* import-globals-from aboutDialog-appUpdater.js */
// Services = object with smart getters for common XPCOM services // Services = object with smart getters for common XPCOM services
var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
var { AppConstants } = ChromeUtils.import( var { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm" "resource://gre/modules/AppConstants.jsm"
); );
if (AppConstants.MOZ_UPDATER) { if (AppConstants.MOZ_UPDATER) {
Services.scriptloader.loadSubScript( Services.scriptloader.loadSubScript(
"chrome://browser/content/aboutDialog-appUpdater.js", "chrome://browser/content/aboutDialog-appUpdater.js",
this this
); );
} }
async function init(aEvent) { async function init(aEvent) {
if (aEvent.target != document) { if (aEvent.target != document) {
return; return;
} }
var distroId = Services.prefs.getCharPref("distribution.id", ""); var distroId = Services.prefs.getCharPref("distribution.id", "");
if (distroId) { if (distroId) {
var distroAbout = Services.prefs.getStringPref("distribution.about", ""); var distroAbout = Services.prefs.getStringPref("distribution.about", "");
// If there is about text, we always show it. // If there is about text, we always show it.
if (distroAbout) { if (distroAbout) {
var distroField = document.getElementById("distribution"); var distroField = document.getElementById("distribution");
distroField.value = distroAbout; distroField.value = distroAbout;
distroField.style.display = "block"; distroField.style.display = "block";
} }
// If it's not a mozilla distribution, show the rest, // If it's not a mozilla distribution, show the rest,
// unless about text exists, then we always show. // unless about text exists, then we always show.
if (!distroId.startsWith("mozilla-") || distroAbout) { if (!distroId.startsWith("mozilla-") || distroAbout) {
var distroVersion = Services.prefs.getCharPref( var distroVersion = Services.prefs.getCharPref(
"distribution.version", "distribution.version",
"" ""
); );
if (distroVersion) { if (distroVersion) {
distroId += " - " + distroVersion; distroId += " - " + distroVersion;
} }
var distroIdField = document.getElementById("distributionId"); var distroIdField = document.getElementById("distributionId");
distroIdField.value = distroId; distroIdField.value = distroId;
distroIdField.style.display = "block"; distroIdField.style.display = "block";
} }
} }
// Include the build ID and display warning if this is an "a#" (nightly or aurora) build // Include the build ID and display warning if this is an "a#" (nightly or aurora) build
let versionId = "aboutDialog-version"; let versionId = "aboutDialog-version";
let versionAttributes = { let versionAttributes = {
version: AppConstants.MOZ_APP_VERSION_DISPLAY, version: AppConstants.MOZ_APP_VERSION_DISPLAY,
bits: Services.appinfo.is64Bit ? 64 : 32, bits: Services.appinfo.is64Bit ? 64 : 32,
}; };
let version = Services.appinfo.version; let version = Services.appinfo.version;
if (/a\d+$/.test(version)) { if (/a\d+$/.test(version)) {
versionId = "aboutDialog-version-nightly"; versionId = "aboutDialog-version-nightly";
let buildID = Services.appinfo.appBuildID; let buildID = Services.appinfo.appBuildID;
let year = buildID.slice(0, 4); let year = buildID.slice(0, 4);
let month = buildID.slice(4, 6); let month = buildID.slice(4, 6);
let day = buildID.slice(6, 8); let day = buildID.slice(6, 8);
versionAttributes.isodate = `${year}-${month}-${day}`; versionAttributes.isodate = `${year}-${month}-${day}`;
document.getElementById("experimental").hidden = false; document.getElementById("experimental").hidden = false;
document.getElementById("communityDesc").hidden = true; document.getElementById("communityDesc").hidden = true;
} }
// Use Fluent arguments for append version and the architecture of the build // Use Fluent arguments for append version and the architecture of the build
let versionField = document.getElementById("version"); let versionField = document.getElementById("version");
document.l10n.setAttributes(versionField, versionId, versionAttributes); document.l10n.setAttributes(versionField, versionId, versionAttributes);
await document.l10n.translateElements([versionField]); await document.l10n.translateElements([versionField]);
// Show a release notes link if we have a URL. window.sizeToContent();
let relNotesLink = document.getElementById("releasenotes");
let relNotesPrefType = Services.prefs.getPrefType( if (AppConstants.platform == "macosx") {
"app.releaseNotesURL.aboutDialog" window.moveTo(
); screen.availWidth / 2 - window.outerWidth / 2,
if (relNotesPrefType != Services.prefs.PREF_INVALID) { screen.availHeight / 5
let relNotesURL = Services.urlFormatter.formatURLPref( );
"app.releaseNotesURL.aboutDialog" }
); }
if (relNotesURL != "about:blank") {
relNotesLink.href = relNotesURL;
relNotesLink.hidden = false;
}
}
if (AppConstants.MOZ_UPDATER) {
gAppUpdater = new appUpdater({ buttonAutoFocus: true });
let channelLabel = document.getElementById("currentChannel");
let currentChannelText = document.getElementById("currentChannelText");
channelLabel.value = UpdateUtils.UpdateChannel;
let hasWinPackageId = false;
try {
hasWinPackageId = Services.sysinfo.getProperty("hasWinPackageId");
} catch (_ex) {
// The hasWinPackageId property doesn't exist; assume it should be false.
}
if (/^release($|\-)/.test(channelLabel.value) || hasWinPackageId) {
currentChannelText.hidden = true;
}
}
if (AppConstants.IS_ESR) {
document.getElementById("release").hidden = false;
}
window.sizeToContent();
if (AppConstants.platform == "macosx") {
window.moveTo(
screen.availWidth / 2 - window.outerWidth / 2,
screen.availHeight / 5
);
}
}

1
themes/browser/base/content/aboutDialog.xhtml
View file

@ -6,7 +6,6 @@
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/aboutDialog.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/content/aboutDialog.css" type="text/css"?>
<?xml-stylesheet href="chrome://branding/content/aboutDialog.css" type="text/css"?>
<window xmlns:html="http://www.w3.org/1999/xhtml" <window xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"