diff -Nru firefox-96.0.1+build1/browser/base/content/tabbrowser-tab.js firefox-96.0.2+build1/browser/base/content/tabbrowser-tab.js --- firefox-96.0.1+build1/browser/base/content/tabbrowser-tab.js 2022-01-14 11:15:39.000000000 +0000 +++ firefox-96.0.2+build1/browser/base/content/tabbrowser-tab.js 2022-01-20 06:24:48.000000000 +0000 @@ -26,6 +26,7 @@ onoverflow="this.setAttribute('textoverflow', 'true');" onunderflow="this.removeAttribute('textoverflow');" align="start" + pack="center" flex="1"> diff -Nru firefox-96.0.1+build1/browser/components/BrowserGlue.jsm firefox-96.0.2+build1/browser/components/BrowserGlue.jsm --- firefox-96.0.1+build1/browser/components/BrowserGlue.jsm 2022-01-14 11:15:39.000000000 +0000 +++ firefox-96.0.2+build1/browser/components/BrowserGlue.jsm 2022-01-20 06:24:47.000000000 +0000 @@ -2527,12 +2527,6 @@ { task: () => { - UrlbarQuickSuggest.maybeShowOnboardingDialog(); - }, - }, - - { - task: () => { let { setTimeout } = ChromeUtils.import( "resource://gre/modules/Timer.jsm" ); @@ -4109,7 +4103,10 @@ if (willPrompt) { let win = BrowserWindowTracker.getTopWindow(); DefaultBrowserCheck.prompt(win); + } else if (await UrlbarQuickSuggest.maybeShowOnboardingDialog()) { + return; } + await ASRouter.waitForInitialized; ASRouter.sendTriggerMessage({ browser: BrowserWindowTracker.getTopWindow()?.gBrowser.selectedBrowser, diff -Nru firefox-96.0.1+build1/browser/components/extensions/test/browser/browser_ext_contentscript_nontab_connect.js firefox-96.0.2+build1/browser/components/extensions/test/browser/browser_ext_contentscript_nontab_connect.js --- firefox-96.0.1+build1/browser/components/extensions/test/browser/browser_ext_contentscript_nontab_connect.js 2022-01-14 11:15:39.000000000 +0000 +++ firefox-96.0.2+build1/browser/components/extensions/test/browser/browser_ext_contentscript_nontab_connect.js 2022-01-20 06:24:48.000000000 +0000 @@ -11,12 +11,9 @@ browser.runtime.onConnect.addListener(port => { browser.test.assertEq(port.sender.tab, undefined, "Sender is not a tab"); + browser.test.assertEq(port.sender.frameId, undefined, "frameId unset"); browser.test.assertEq(port.sender.url, FRAME_URL, "Expected sender URL"); - let { frameId } = port.sender; - browser.test.assertEq(typeof frameId, "number", "frameId is a number"); - browser.test.assertTrue(frameId > 0, "frameId greater than 0"); - port.onMessage.addListener(msg => { browser.test.assertEq("pong", msg, "Reply from content script"); port.disconnect(); diff -Nru firefox-96.0.1+build1/browser/components/newtab/lib/RemoteL10n.jsm firefox-96.0.2+build1/browser/components/newtab/lib/RemoteL10n.jsm --- firefox-96.0.1+build1/browser/components/newtab/lib/RemoteL10n.jsm 2022-01-14 11:15:40.000000000 +0000 +++ firefox-96.0.2+build1/browser/components/newtab/lib/RemoteL10n.jsm 2022-01-20 06:24:48.000000000 +0000 @@ -186,7 +186,7 @@ if (useRemoteL10n && !L10nRegistry.getInstance().hasSource("cfr")) { const appLocale = Services.locale.appLocaleAsBCP47; const l10nFluentDir = PathUtils.join( - Services.dirsvc.get("ProfD", Ci.nsIFile).path, + Services.dirsvc.get("ProfLD", Ci.nsIFile).path, "settings", "main", "ms-language-packs" diff -Nru firefox-96.0.1+build1/browser/components/preferences/privacy.inc.xhtml firefox-96.0.2+build1/browser/components/preferences/privacy.inc.xhtml --- firefox-96.0.1+build1/browser/components/preferences/privacy.inc.xhtml 2022-01-14 11:15:40.000000000 +0000 +++ firefox-96.0.2+build1/browser/components/preferences/privacy.inc.xhtml 2022-01-20 06:24:48.000000000 +0000 @@ -651,6 +651,10 @@ @@ -692,6 +698,7 @@ type="checkbox" class="toggle-button firefoxSuggestToggle" preference="browser.urlbar.quicksuggest.dataCollection.enabled" + form="firefoxSuggestForm" aria-labelledby="firefoxSuggestDataCollectionLabel" aria-describedby="firefoxSuggestDataCollectionDescription"/> diff -Nru firefox-96.0.1+build1/browser/components/urlbar/content/firefoxSuggest.ftl firefox-96.0.2+build1/browser/components/urlbar/content/firefoxSuggest.ftl --- firefox-96.0.1+build1/browser/components/urlbar/content/firefoxSuggest.ftl 2022-01-14 11:15:40.000000000 +0000 +++ firefox-96.0.2+build1/browser/components/urlbar/content/firefoxSuggest.ftl 2022-01-20 06:24:48.000000000 +0000 @@ -84,3 +84,84 @@ # Sponsored suggestions: off # Data collection: on addressbar-firefox-suggest-info-data = Based on your selection, you won’t receive suggestions from the web or sponsored sites. We will process your search query data to develop the { -firefox-suggest-brand-name } feature. + +## Used as title on the introduction pane. The text can be formatted to span +## multiple lines as needed (line breaks are significant). + +firefox-suggest-onboarding-introduction-title-1 = + Make sure you’ve got our latest + search experience +firefox-suggest-onboarding-introduction-title-2 = + We’re building a better search experience — + one you can trust +firefox-suggest-onboarding-introduction-title-3 = + We’re building a better way to find what + you’re looking for on the web +firefox-suggest-onboarding-introduction-title-4 = + A faster search experience is in the works +firefox-suggest-onboarding-introduction-title-5 = + Together, we can create the kind of search + experience the Internet deserves +firefox-suggest-onboarding-introduction-title-6 = + Meet { -firefox-suggest-brand-name }, the next + evolution in search +firefox-suggest-onboarding-introduction-title-7 = + Find the best of the web, faster. + +## + +firefox-suggest-onboarding-introduction-close-button = + .title = Close + +firefox-suggest-onboarding-introduction-next-button-1 = Find out how +firefox-suggest-onboarding-introduction-next-button-2 = Find out more + +## Used as title on the main pane. The text can be formatted to span +## multiple lines as needed (line breaks are significant). + +firefox-suggest-onboarding-main-title-1 = + We’re building a richer search experience +firefox-suggest-onboarding-main-title-2 = + Help us guide the way to the + best of the Internet +firefox-suggest-onboarding-main-title-3 = + A richer, smarter search experience +firefox-suggest-onboarding-main-title-4 = + Finding the best of the web, faster +firefox-suggest-onboarding-main-title-5 = + We’re building a better search experience — + you can help +firefox-suggest-onboarding-main-title-6 = + It’s time to think outside the search engine +firefox-suggest-onboarding-main-title-7 = + We’re building a smarter search experience — + one you can trust +firefox-suggest-onboarding-main-title-8 = + Finding the best of the web should be + simpler and more secure. + +## + +firefox-suggest-onboarding-main-description-1 = Allowing { -vendor-short-name } to process your search queries means you’re helping us create smarter, more relevant search suggestions. And, as always, we’ll keep your privacy top of mind. +firefox-suggest-onboarding-main-description-2 = When you allow { -vendor-short-name } to process your search queries, you’re helping build a better { -firefox-suggest-brand-name } for everyone. And, as always, we’ll keep your privacy top of mind. +firefox-suggest-onboarding-main-description-3 = What if your browser helped you zero in on what you’re actually looking for? Allowing { -vendor-short-name } to process your search queries helps us create more relevant search suggestions that still keep your privacy top of mind. +firefox-suggest-onboarding-main-description-4 = You’re trying to get where you’re going on the web and get on with it. When you allow { -vendor-short-name } to process your search queries, we can help you get there faster—while keeping your privacy top of mind. +firefox-suggest-onboarding-main-description-5 = Allowing { -vendor-short-name } to process your search queries will help us create more relevant suggestions for everyone. And, as always, we’ll keep your privacy top of mind. +firefox-suggest-onboarding-main-description-6 = Allowing { -vendor-short-name } to process your search queries will help us create more relevant search suggestions. We’re building { -firefox-suggest-brand-name } to help you get where you’re going on the Internet while keeping your privacy in mind. +firefox-suggest-onboarding-main-description-7 = Allowing { -vendor-short-name } to process your search queries helps us create more relevant search suggestions. +firefox-suggest-onboarding-main-description-8 = Allowing { -vendor-short-name } to process your search queries helps us provide more relevant search suggestions. We don’t use this data to profile you on the web. + +firefox-suggest-onboarding-main-privacy-first = No user profiling. Privacy-first, always. + +firefox-suggest-onboarding-main-accept-option-label = Allow. Learn more + +firefox-suggest-onboarding-main-accept-option-description-1 = Help improve the { -firefox-suggest-brand-name } feature with more relevant suggestions. Your search queries will be processed. +firefox-suggest-onboarding-main-accept-option-description-2 = Recommended for people who support improving the { -firefox-suggest-brand-name } feature.  Your search queries will be processed. + +firefox-suggest-onboarding-main-reject-option-label = Don’t allow. + +firefox-suggest-onboarding-main-reject-option-description-1 = Keep the default { -firefox-suggest-brand-name } experience with the strictest data-sharing controls. +firefox-suggest-onboarding-main-reject-option-description-2 = Recommended for people who prefer the strictest data-sharing controls. Keep the default experience. + +firefox-suggest-onboarding-main-submit-button = Save preferences +firefox-suggest-onboarding-main-skip-link = Not now diff -Nru firefox-96.0.1+build1/browser/components/urlbar/content/quicksuggestOnboarding.css firefox-96.0.2+build1/browser/components/urlbar/content/quicksuggestOnboarding.css --- firefox-96.0.1+build1/browser/components/urlbar/content/quicksuggestOnboarding.css 2022-01-14 11:15:40.000000000 +0000 +++ firefox-96.0.2+build1/browser/components/urlbar/content/quicksuggestOnboarding.css 2022-01-20 06:24:48.000000000 +0000 @@ -2,40 +2,270 @@ * 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/. */ -#infoContainer { +/** + * We follow the example of the upgrade dialog for font sizes, line heights, + * etc. See: https://searchfox.org/mozilla-central/source/browser/themes/shared/upgradeDialog.css + */ + +:root { + --introduction-magglass-logo-height: 128px; + --introduction-firefox-logo-height: 72px; + --main-magglass-logo-height: 64px; + --main-firefox-logo-height: 50px; + --x-large-margin: 40px; + --large-margin: 24px; + --large-margin-const: 24px; + --small-margin: 16px; + --small-margin-const: 16px; + --x-small-margin-const: 8px; + --section-vertical-padding: 32px; + --section-horizontal-padding: 64px; +} + +body.compact { + --main-magglass-logo-height: 48px; + --main-firefox-logo-height: 32px; + --x-large-margin: 20px; + --large-margin: 12px; + --small-margin: 8px; + --section-vertical-padding: 16px; + --section-horizontal-padding: 32px; + + /* 15px is the non-compact font-size. */ + font-size: 13px; +} + +body, +section { + width: 536px; +} + +section { + display: flex; + align-items: stretch; + justify-content: center; + flex-direction: column; text-align: center; - padding: 1em 0; + padding: var(--section-vertical-padding) var(--section-horizontal-padding); + /* This is the largest approximate natural height of the main section across + platforms and dialog variations, erring on the side of being slightly + larger than necessary. If you change this, also update COMPACT_MODE_HEIGHT + in the JS. */ + min-height: 650px; +} + +body.compact section { + /* This is the largest approximate natural height of the main section across + platforms and dialog variations in compact mode, erring on the side of + being slightly larger than necessary. */ + min-height: 510px; } a { cursor: pointer; + font-weight: normal; +} + +.title { + font-size: 1.6em; + font-weight: 600; + line-height: 1.5; + white-space: pre-line; +} + +.logo { + background-repeat: no-repeat; + background-position: center; + background-size: contain; + border: none; +} + +.pager > span { + display: inline-block; + border-radius: 3px; + width: 6px; + height: 6px; + background-color: var(--in-content-border-color); + margin-inline: 4px; +} + +.pager > .current { + background-color: var(--in-content-primary-button-background); } -#notNowLinkContainer { - text-align: end; - padding-inline-end: 1em; +#introduction-section .logo { + background-image: url("quicksuggestOnboarding_magglass.svg"); + height: var(--introduction-magglass-logo-height); + margin-block-end: var(--large-margin); } -#infoIcon { - width: 112px; - height: 112px; - margin: 0 auto 1em; +#introduction-section .logo.firefox { background-image: url("chrome://branding/content/about-logo.svg"); - background-size: 100%; + height: var(--introduction-firefox-logo-height); +} + +@media (prefers-reduced-motion: no-preference) { + #introduction-section .logo { + background-image: url("quicksuggestOnboarding_magglass_animation.svg"); + } +} + +#introduction-section .title { + margin-block-end: var(--x-large-margin); +} + +#onboardingClose { + position: absolute; + top: 0; + inset-inline-end: 0; + margin: 16px; + padding: 0; + line-height: 0; + min-width: 20px; + min-height: 20px; +} + +#onboardingClose img { + -moz-context-properties: fill; + fill: currentColor; +} + +#main-section:not(.active) { + display: none; +} + +#main-section .logo { + background-image: url("quicksuggestOnboarding_magglass.svg"); + height: var(--main-magglass-logo-height); + margin-block-end: var(--large-margin); +} + +#main-section .logo.firefox { + background-image: url("chrome://branding/content/about-logo.svg"); + height: var(--main-firefox-logo-height); +} + +#main-section .title { + margin-block: 0 var(--small-margin); +} + +#main-section .description-section { + /* The effective visual margin between the description and first option should + be --large-margin-const. Each child in the description has a bottom margin + of --small-margin, so subtract it from --large-margin-const. */ + margin-block: 0 calc(var(--large-margin-const) - var(--small-margin)); +} + +#main-section .description { + font-size: 1.1em; + font-weight: 400; + line-height: 1.6; + margin-block: 0 var(--small-margin); +} + +#main-section .privacy-first { + font-size: 1.1em; + font-weight: 700; + margin-block: 0 var(--small-margin); +} + +#main-section .privacy-first:not(.active) { + display: none; +} + +#main-section .option { + border-radius: 4px; + border: 2px solid var(--in-content-box-info-background); + display: flex; + text-align: start; + /* Use --small-margin-const for the horizontal padding to make the option's + horizontal padding larger than the vertical padding in compact mode. The + radio button and text are too close to the left and right edges of the + option's border otherwise. */ + padding: var(--small-margin) var(--small-margin-const); + flex-direction: row; +} + +#main-section .option.selected { + border-color: var(--in-content-primary-button-background); +} + +#main-section .option.accept { + margin-block-end: var(--small-margin); +} + +#main-section .option.reject { + margin-block-end: var(--large-margin-const); +} + +#main-section .option > label { + /* Make the whole option area selectable for the radio button. 22px is the + width of the radio button and its inline margin. */ + padding-block: var(--small-margin); + padding-inline-start: calc(22px + var(--small-margin-const)); + padding-inline-end: var(--small-margin-const); + margin-block: calc(-1 * var(--small-margin)); + margin-inline-start: calc(-1 * (22px + var(--small-margin-const))); + margin-inline-end: calc(-1 * var(--small-margin-const)); +} + +body:not(.compact) #main-section .option > input { + /* Vertically align the radio button with the .option-label. */ + margin-block-start: 0.25em; +} + +#main-section .option-label { + font-size: 1.1em; + font-weight: 600; + margin-block-end: 2px; +} + +#main-section .option-description { + font-size: 1em; +} + +.buttonBox { + display: flex; + flex-direction: column; + align-items: center; +} + +button { + margin-block-end: var(--large-margin); +} + +#onboardingSkipLink { + margin-block-end: var(--x-small-margin-const); +} + +/* transition from introduction to main */ +#introduction-section.inactive { + /* Avoid including this section size */ + position: fixed; + pointer-events: none; + animation: fadeout 0.3s forwards; } -#infoTitle { - font-size: 1.5em; - margin: 0; +#main-section.active { + animation: fadein 0.3s forwards; } -#infoBody { - margin: 1em 0; +@keyframes fadeout { + 0% { + opacity: 1; + } + 100% { + visibility: hidden; + opacity: 0; + } } -#illustration { - background: url("quicksuggestOnboarding_illustration.svg") no-repeat center; - min-width: 538px; - height: 219px; - margin: 1em 0 2em; +@keyframes fadein { + 0% { + opacity: 0; + } + 100% { + pointer-events: initial; + opacity: 1; + } } diff -Nru firefox-96.0.1+build1/browser/components/urlbar/content/quicksuggestOnboarding.html firefox-96.0.2+build1/browser/components/urlbar/content/quicksuggestOnboarding.html --- firefox-96.0.1+build1/browser/components/urlbar/content/quicksuggestOnboarding.html 1970-01-01 00:00:00.000000000 +0000 +++ firefox-96.0.2+build1/browser/components/urlbar/content/quicksuggestOnboarding.html 2022-01-20 06:24:48.000000000 +0000 @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + +

+ + +

+ +

+ + +

+ +

+ + +

+ +

+ + + +

+ + diff -Nru firefox-96.0.1+build1/browser/components/urlbar/content/quicksuggestOnboarding_illustration.svg firefox-96.0.2+build1/browser/components/urlbar/content/quicksuggestOnboarding_illustration.svg --- firefox-96.0.1+build1/browser/components/urlbar/content/quicksuggestOnboarding_illustration.svg 2022-01-14 11:15:39.000000000 +0000 +++ firefox-96.0.2+build1/browser/components/urlbar/content/quicksuggestOnboarding_illustration.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ - - - diff -Nru firefox-96.0.1+build1/browser/components/urlbar/content/quicksuggestOnboarding.js firefox-96.0.2+build1/browser/components/urlbar/content/quicksuggestOnboarding.js --- firefox-96.0.1+build1/browser/components/urlbar/content/quicksuggestOnboarding.js 2022-01-14 11:15:40.000000000 +0000 +++ firefox-96.0.2+build1/browser/components/urlbar/content/quicksuggestOnboarding.js 2022-01-20 06:24:48.000000000 +0000 @@ -8,56 +8,238 @@ "resource:///modules/UrlbarQuickSuggest.jsm" ); -document.addEventListener("dialogaccept", event => { - // dialogaccept is fired when the user presses the enter key even when an - // element other than the accept button is focused. If another element is - // focused, then peform its action. - switch (document.activeElement?.id) { - case "onboardingSettingsButton": - window.arguments[0].choice = ONBOARDING_CHOICE.SETTINGS; - event.preventDefault(); - window.close(); - return; - case "onboardingNotNow": - window.arguments[0].choice = ONBOARDING_CHOICE.NOT_NOW; - event.preventDefault(); - window.close(); - return; - case "onboardingLearnMore": - window.arguments[0].choice = ONBOARDING_CHOICE.LEARN_MORE; - event.preventDefault(); - window.close(); +const VARIATION_MAP = { + a: { + l10nUpdates: { + onboardingNext: "firefox-suggest-onboarding-introduction-next-button-1", + "introduction-title": "firefox-suggest-onboarding-introduction-title-1", + "main-title": "firefox-suggest-onboarding-main-title-1", + "main-description": "firefox-suggest-onboarding-main-description-1", + "main-accept-option-description": + "firefox-suggest-onboarding-main-accept-option-description-1", + "main-reject-option-description": + "firefox-suggest-onboarding-main-reject-option-description-1", + }, + }, + b: { + l10nUpdates: { + onboardingNext: "firefox-suggest-onboarding-introduction-next-button-1", + "introduction-title": "firefox-suggest-onboarding-introduction-title-2", + "main-title": "firefox-suggest-onboarding-main-title-2", + "main-description": "firefox-suggest-onboarding-main-description-2", + "main-accept-option-description": + "firefox-suggest-onboarding-main-accept-option-description-1", + "main-reject-option-description": + "firefox-suggest-onboarding-main-reject-option-description-1", + }, + }, + c: { + logoType: "firefox", + l10nUpdates: { + onboardingNext: "firefox-suggest-onboarding-introduction-next-button-1", + "introduction-title": "firefox-suggest-onboarding-introduction-title-3", + "main-title": "firefox-suggest-onboarding-main-title-3", + "main-description": "firefox-suggest-onboarding-main-description-3", + "main-accept-option-description": + "firefox-suggest-onboarding-main-accept-option-description-1", + "main-reject-option-description": + "firefox-suggest-onboarding-main-reject-option-description-1", + }, + }, + d: { + l10nUpdates: { + onboardingNext: "firefox-suggest-onboarding-introduction-next-button-1", + "introduction-title": "firefox-suggest-onboarding-introduction-title-4", + "main-title": "firefox-suggest-onboarding-main-title-4", + "main-description": "firefox-suggest-onboarding-main-description-4", + "main-accept-option-description": + "firefox-suggest-onboarding-main-accept-option-description-2", + "main-reject-option-description": + "firefox-suggest-onboarding-main-reject-option-description-2", + }, + }, + e: { + logoType: "firefox", + l10nUpdates: { + onboardingNext: "firefox-suggest-onboarding-introduction-next-button-1", + "introduction-title": "firefox-suggest-onboarding-introduction-title-5", + "main-title": "firefox-suggest-onboarding-main-title-5", + "main-description": "firefox-suggest-onboarding-main-description-5", + "main-accept-option-description": + "firefox-suggest-onboarding-main-accept-option-description-2", + "main-reject-option-description": + "firefox-suggest-onboarding-main-reject-option-description-2", + }, + }, + f: { + l10nUpdates: { + onboardingNext: "firefox-suggest-onboarding-introduction-next-button-2", + "introduction-title": "firefox-suggest-onboarding-introduction-title-6", + "main-title": "firefox-suggest-onboarding-main-title-6", + "main-description": "firefox-suggest-onboarding-main-description-6", + "main-accept-option-description": + "firefox-suggest-onboarding-main-accept-option-description-2", + "main-reject-option-description": + "firefox-suggest-onboarding-main-reject-option-description-2", + }, + }, + g: { + mainPrivacyFirst: true, + l10nUpdates: { + onboardingNext: "firefox-suggest-onboarding-introduction-next-button-1", + "introduction-title": "firefox-suggest-onboarding-introduction-title-7", + "main-title": "firefox-suggest-onboarding-main-title-7", + "main-description": "firefox-suggest-onboarding-main-description-7", + "main-accept-option-description": + "firefox-suggest-onboarding-main-accept-option-description-2", + "main-reject-option-description": + "firefox-suggest-onboarding-main-reject-option-description-2", + }, + }, + h: { + logoType: "firefox", + l10nUpdates: { + onboardingNext: "firefox-suggest-onboarding-introduction-next-button-1", + "introduction-title": "firefox-suggest-onboarding-introduction-title-2", + "main-title": "firefox-suggest-onboarding-main-title-8", + "main-description": "firefox-suggest-onboarding-main-description-8", + "main-accept-option-description": + "firefox-suggest-onboarding-main-accept-option-description-1", + "main-reject-option-description": + "firefox-suggest-onboarding-main-reject-option-description-1", + }, + }, +}; + +// If the window height is smaller than this value when the dialog opens, then +// the dialog will open in compact mode. The dialog will not change modes while +// it's open even if the window height changes. +const COMPACT_MODE_HEIGHT = + 650 + // section min-height (non-compact mode) + 2 * 32 + // 2 * --section-vertical-padding (non-compact mode) + 44; // approximate height of the browser window's tab bar + +// Used for test only. If links or buttons may be clicked or typed Key_Enter +// while translating l10n, cannot capture the events since not register listeners +// yet. To avoid the issue, add this flag to know the listeners are ready. +let resolveOnboardingReady; +window._quicksuggestOnboardingReady = new Promise(r => { + resolveOnboardingReady = r; +}); + +document.addEventListener("DOMContentLoaded", async () => { + await document.l10n.ready; + + const variation = VARIATION_MAP[window.arguments[0].variationType]; + if (variation) { + document.l10n.pauseObserving(); + try { + await applyVariation(variation); + } finally { + document.l10n.resumeObserving(); + } + } + + addSubmitListener(document.getElementById("onboardingClose"), () => { + window.arguments[0].choice = ONBOARDING_CHOICE.CLOSE_1; + window.close(); + }); + addSubmitListener(document.getElementById("onboardingNext"), () => { + window.arguments[0].visitedMain = true; + document.getElementById("introduction-section").classList.add("inactive"); + document.getElementById("main-section").classList.add("active"); + document.body.setAttribute("aria-labelledby", "main-title"); + let ariaDescribedBy = "main-description"; + if (variation?.mainPrivacyFirst) { + ariaDescribedBy += " main-privacy-first"; + } + document.body.setAttribute("aria-describedby", ariaDescribedBy); + }); + addSubmitListener(document.getElementById("onboardingLearnMore"), () => { + window.arguments[0].choice = ONBOARDING_CHOICE.LEARN_MORE_2; + window.close(); + }); + addSubmitListener(document.getElementById("onboardingSkipLink"), () => { + window.arguments[0].choice = ONBOARDING_CHOICE.NOT_NOW_2; + window.close(); + }); + + const onboardingSubmit = document.getElementById("onboardingSubmit"); + const onboardingAccept = document.getElementById("onboardingAccept"); + const onboardingReject = document.getElementById("onboardingReject"); + function optionChangeListener() { + onboardingSubmit.removeAttribute("disabled"); + onboardingAccept + .closest(".option") + .classList.toggle("selected", onboardingAccept.checked); + onboardingReject + .closest(".option") + .classList.toggle("selected", !onboardingAccept.checked); + } + onboardingAccept.addEventListener("change", optionChangeListener); + onboardingReject.addEventListener("change", optionChangeListener); + + function submitListener() { + if (!onboardingAccept.checked && !onboardingReject.checked) { return; + } + + window.arguments[0].choice = onboardingAccept.checked + ? ONBOARDING_CHOICE.ACCEPT_2 + : ONBOARDING_CHOICE.REJECT_2; + window.close(); } + addSubmitListener(onboardingSubmit, submitListener); + onboardingAccept.addEventListener("keydown", e => { + if (e.keyCode == e.DOM_VK_RETURN) { + submitListener(); + } + }); + onboardingReject.addEventListener("keydown", e => { + if (e.keyCode == e.DOM_VK_RETURN) { + submitListener(); + } + }); - window.arguments[0].choice = ONBOARDING_CHOICE.ACCEPT; -}); + if (window.outerHeight < COMPACT_MODE_HEIGHT) { + document.body.classList.add("compact"); + } -document.addEventListener("dialogextra1", () => { - window.arguments[0].choice = ONBOARDING_CHOICE.SETTINGS; - window.close(); + resolveOnboardingReady(); }); -document.getElementById("onboardingNotNow").addEventListener("click", () => { - window.arguments[0].choice = ONBOARDING_CHOICE.NOT_NOW; - window.close(); -}); +async function applyVariation(variation) { + if (variation.logoType) { + for (const logo of document.querySelectorAll(".logo")) { + logo.classList.add(variation.logoType); + } + } -document.getElementById("onboardingLearnMore").addEventListener("click", () => { - window.arguments[0].choice = ONBOARDING_CHOICE.LEARN_MORE; - window.close(); -}); + if (variation.mainPrivacyFirst) { + const label = document.querySelector("#main-section .privacy-first"); + label.classList.add("active"); + } + + if (variation.l10nUpdates) { + const translatedElements = []; + for (const [id, newL10N] of Object.entries(variation.l10nUpdates)) { + const element = document.getElementById(id); + document.l10n.setAttributes(element, newL10N); + translatedElements.push(element); + } + await document.l10n.translateElements(translatedElements); + } +} -// If we change the system font size while displaying the dialog, problem that -// components are hidden might happen dependent on the size. To avoid it, we -// resize dialog explicitly whenever the size of internal components are changed. -window.addEventListener("load", () => { - const resizeObserver = new ResizeObserver(() => { - // resizeDialog() does not make window height smaller even if the total - // height of internal components is smaller. So, we minimize the window - // size once, then prompt to recalculate to be appropriate size. - window.resizeBy(0, -window.innerHeight); - window.opener.gDialogBox.dialog.resizeDialog(); +function addSubmitListener(element, listener) { + if (!element) { + console.warn("Element is null on addSubmitListener"); + return; + } + element.addEventListener("click", listener); + element.addEventListener("keydown", e => { + if (e.keyCode == e.DOM_VK_RETURN) { + listener(); + } }); - resizeObserver.observe(document.getElementById("infoContainer")); -}); +} diff -Nru firefox-96.0.1+build1/browser/components/urlbar/content/quicksuggestOnboarding_magglass_animation.svg firefox-96.0.2+build1/browser/components/urlbar/content/quicksuggestOnboarding_magglass_animation.svg --- firefox-96.0.1+build1/browser/components/urlbar/content/quicksuggestOnboarding_magglass_animation.svg 1970-01-01 00:00:00.000000000 +0000 +++ firefox-96.0.2+build1/browser/components/urlbar/content/quicksuggestOnboarding_magglass_animation.svg 2022-01-20 06:24:48.000000000 +0000 @@ -0,0 +1,4 @@ + + diff -Nru firefox-96.0.1+build1/browser/components/urlbar/content/quicksuggestOnboarding_magglass.svg firefox-96.0.2+build1/browser/components/urlbar/content/quicksuggestOnboarding_magglass.svg --- firefox-96.0.1+build1/browser/components/urlbar/content/quicksuggestOnboarding_magglass.svg 1970-01-01 00:00:00.000000000 +0000 +++ firefox-96.0.2+build1/browser/components/urlbar/content/quicksuggestOnboarding_magglass.svg 2022-01-20 06:24:48.000000000 +0000 @@ -0,0 +1,34 @@ + + diff -Nru firefox-96.0.1+build1/browser/components/urlbar/content/quicksuggestOnboarding.xhtml firefox-96.0.2+build1/browser/components/urlbar/content/quicksuggestOnboarding.xhtml --- firefox-96.0.1+build1/browser/components/urlbar/content/quicksuggestOnboarding.xhtml 2022-01-14 11:15:39.000000000 +0000 +++ firefox-96.0.2+build1/browser/components/urlbar/content/quicksuggestOnboarding.xhtml 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ - - - - - - - - - - -