diff options
Diffstat (limited to 'browser/components/preferences/main.js')
-rw-r--r-- | browser/components/preferences/main.js | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js index b578e0e29f..22bd3fe174 100644 --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js @@ -430,19 +430,29 @@ var gMainPane = { "command", gMainPane.onWindowsLaunchOnLoginChange ); - NimbusFeatures.windowsLaunchOnLogin.recordExposureEvent({ - once: true, - }); // We do a check here for startWithLastProfile as we could // have disabled the pref for the user before they're ever // exposed to the experiment on a new profile. + // If we're using MSIX, we don't show the checkbox as MSIX + // can't write to the registry. if ( - NimbusFeatures.windowsLaunchOnLogin.getVariable("enabled") && Cc["@mozilla.org/toolkit/profile-service;1"].getService( Ci.nsIToolkitProfileService - ).startWithLastProfile + ).startWithLastProfile && + !Services.sysinfo.getProperty("hasWinPackageId", false) ) { - document.getElementById("windowsLaunchOnLoginBox").hidden = false; + NimbusFeatures.windowsLaunchOnLogin.recordExposureEvent({ + once: true, + }); + + if ( + Services.prefs.getBoolPref( + "browser.startup.windowsLaunchOnLogin.enabled", + false + ) + ) { + document.getElementById("windowsLaunchOnLoginBox").hidden = false; + } } } gMainPane.updateBrowserStartupUI = @@ -521,6 +531,14 @@ var gMainPane = { document.getElementById("dataMigrationGroup").remove(); } + if ( + Services.prefs.getBoolPref("browser.backup.preferences.ui.enabled", false) + ) { + let backupGroup = document.getElementById("dataBackupGroup"); + backupGroup.hidden = false; + backupGroup.removeAttribute("data-hidden-from-search"); + } + // For media control toggle button, we support it on Windows, macOS and // gtk-based Linux. if ( @@ -1130,7 +1148,7 @@ var gMainPane = { this.markAllDownloadPhases("downloaded"); } catch (error) { TranslationsView.showError( - "translations-manage-error-install", + "translations-manage-error-download", error ); await this.reloadDownloadPhases(); @@ -1167,7 +1185,7 @@ var gMainPane = { this.updateDownloadPhase(langTag, "downloaded"); } catch (error) { TranslationsView.showError( - "translations-manage-error-install", + "translations-manage-error-download", error ); this.updateDownloadPhase(langTag, "uninstalled"); @@ -1221,7 +1239,7 @@ var gMainPane = { document.l10n.setAttributes( downloadButton, - "translations-manage-language-install-button" + "translations-manage-language-download-button" ); document.l10n.setAttributes( deleteButton, @@ -2237,9 +2255,8 @@ var gMainPane = { // 1/2/4 values set via about:config should persist return this._storedFullKeyboardNavigation; } - // When the checkbox is unchecked, this pref shouldn't exist - // at all. - return undefined; + // When the checkbox is unchecked, default to just text controls. + return 1; }, /** @@ -4202,7 +4219,7 @@ const AppearanceChooser = { e.preventDefault(); break; case "web-appearance-manage-themes-link": - window.browsingContext.topChromeWindow.BrowserOpenAddonsMgr( + window.browsingContext.topChromeWindow.BrowserAddonUI.openAddonsMgr( "addons://list/theme" ); e.preventDefault(); |