Merge autoland to mozilla-central. a=merge (d0159179) · Commits · The Tor Project / Applications / Mullvad Browser

browser/app/profile/firefox.js

+1 −1

Original line number	Diff line number	Diff line
		@@ -742,7 +742,7 @@ pref("browser.tabs.tabMinWidth", 76);
		pref("browser.tabs.secondaryTextUnsupportedLocales", "ar,bn,bo,ckb,fa,gu,he,hi,ja,km,kn,ko,lo,mr,my,ne,pa,si,ta,te,th,ur,zh");

		//Control the visibility of Tab Manager Menu.
		pref("browser.tabs.tabmanager.enabled", false);
		pref("browser.tabs.tabmanager.enabled", true);

		// When tabs opened by links in other tabs via a combination of
		// browser.link.open_newwindow being set to 3 and target="_blank" etc are

browser/base/content/test/general/browser_ctrlTab.js

+36 −20

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ add_task(async function() {
		}

		{
		// test for bug 445369
		info("test for bug 445369");
		let tabs = gBrowser.tabs.length;
		await pressCtrlTab();
		await synthesizeCtrlW();
		@@ -49,7 +49,7 @@ add_task(async function() {
		}

		{
		// test for bug 667314
		info("test for bug 667314");
		let tabs = gBrowser.tabs.length;
		await pressCtrlTab();
		await pressCtrlTab(true);
		@@ -67,7 +67,7 @@ add_task(async function() {
		await ctrlTabTest([2, 1, 0], 7, 1);

		{
		// test for bug 1292049
		info("test for bug 1292049");
		let tabToClose = await BrowserTestUtils.openNewForegroundTab(
		gBrowser,
		"about:buildconfig"
		@@ -91,7 +91,7 @@ add_task(async function() {
		}

		{
		// test for bug 445369
		info("test for bug 445369");
		checkTabs(4);
		selectTabs([1, 2, 0]);

		@@ -123,7 +123,7 @@ add_task(async function() {
		checkTabs(1);

		{
		// test for bug 445768
		info("test for bug 445768");
		let focusedWindow = document.commandDispatcher.focusedWindow;
		let eventConsumed = true;
		let detectKeyEvent = function(event) {
		@@ -145,8 +145,7 @@ add_task(async function() {

		// eslint-disable-next-line no-lone-blocks
		{
		// Bug 1731050: test hidden tabs
		info("Starting hidden tabs test");
		info("Bug 1731050: test hidden tabs");
		checkTabs(1);
		await BrowserTestUtils.addTab(gBrowser);
		await BrowserTestUtils.addTab(gBrowser);
		@@ -168,7 +167,7 @@ add_task(async function() {
		await ctrlTabTest([], 2, 0);
		gBrowser.showTab(gBrowser.tabs[4]);
		await ctrlTabTest([2], 3, 4);
		await ctrlTabTest([], 5, 4);
		await ctrlTabTest([], 4, 4);
		gBrowser.showTab(gBrowser.tabs[3]);
		await ctrlTabTest([], 4, 3);
		await ctrlTabTest([], 6, 4);
		@@ -182,21 +181,37 @@ add_task(async function() {

		/* private utility functions */

		function pressCtrlTab(aShiftKey) {
		/**
		* @return the number of times (Shift+)Ctrl+Tab was pressed
		*/
		async function pressCtrlTab(aShiftKey = false) {
		let promise;
		if (!isOpen() && canOpen()) {
		ok(
		!aShiftKey,
		"Shouldn't attempt to open the panel by pressing Shift+Ctrl+Tab"
		);
		info("Pressing Ctrl+Tab to open the panel");
		promise = BrowserTestUtils.waitForEvent(ctrlTab.panel, "popupshown");
		} else {
		info(
		`Pressing ${aShiftKey ? "Shift+" : ""}Ctrl+Tab while the panel is open`
		);
		promise = BrowserTestUtils.waitForEvent(document, "keyup");
		}
		EventUtils.synthesizeKey("VK_TAB", {
		ctrlKey: true,
		shiftKey: !!aShiftKey,
		});
		return promise;
		await promise;
		if (document.activeElement == ctrlTab.showAllButton) {
		info("Repeating keypress to skip over the 'List all tabs' button");
		return 1 + (await pressCtrlTab(aShiftKey));
		}
		return 1;
		}

		function releaseCtrl() {
		async function releaseCtrl() {
		let promise;
		if (isOpen()) {
		promise = BrowserTestUtils.waitForEvent(ctrlTab.panel, "popuphidden");
		@@ -204,16 +219,16 @@ add_task(async function() {
		promise = BrowserTestUtils.waitForEvent(document, "keyup");
		}
		EventUtils.synthesizeKey("VK_CONTROL", { type: "keyup" });
		return promise;
		await promise;
		}

		function synthesizeCtrlW() {
		async function synthesizeCtrlW() {
		let promise = BrowserTestUtils.waitForEvent(
		gBrowser.tabContainer,
		"TabClose"
		);
		EventUtils.synthesizeKey("w", { ctrlKey: true });
		return promise;
		await promise;
		}

		function isOpen() {
		@@ -241,7 +256,7 @@ add_task(async function() {
		selectTabs(tabsToSelect);

		var indexStart = gBrowser.tabContainer.selectedIndex;
		var tabCount = gBrowser.tabs.length;
		var tabCount = gBrowser.visibleTabs.length;
		var normalized = tabTimes % tabCount;
		var where =
		normalized == 1
		@@ -259,8 +274,9 @@ add_task(async function() {
		)
		);

		let numTimesPressed = 0;
		for (let i = 0; i < tabTimes; i++) {
		await pressCtrlTab();
		numTimesPressed += await pressCtrlTab();

		if (tabCount > 2) {
		is(
		@@ -274,7 +290,7 @@ add_task(async function() {
		if (tabCount > 2) {
		ok(
		isOpen(),
		"With " + tabCount + " tabs open, Ctrl+Tab opens the preview panel"
		"With " + tabCount + " visible tabs, Ctrl+Tab opens the preview panel"
		);

		await releaseCtrl();
		@@ -285,7 +301,7 @@ add_task(async function() {
		!isOpen(),
		"With " +
		tabCount +
		" tabs open, Ctrl+Tab doesn't open the preview panel"
		" visible tabs, Ctrl+Tab doesn't open the preview panel"
		);
		}

		@@ -294,10 +310,10 @@ add_task(async function() {
		expectedIndex,
		"With " +
		tabCount +
		" tabs open and tab " +
		" visible tabs and tab " +
		indexStart +
		" selected, Ctrl+Tab*" +
		tabTimes +
		numTimesPressed +
		" goes " +
		where
		);

browser/components/colorways/assets/independent-voices-collection.avif

−1.14 KiB (29.9 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file

browser/components/colorways/colorwaycloset.css

+4 −5

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@

		@media (min-width: 40em) {
		:root {
		--body-columns: 1em repeat(1, 1fr);
		--body-columns: 1em auto 1fr;
		--body-rows: auto 1fr auto;

		--header-column: 2/4;
		@@ -35,7 +35,7 @@
		--figure-row: 2;

		--customization-panel-column: 3;
		--customization-panel-padding-inline-start: 24px;
		--customization-panel-padding-inline-start: 2em;

		--colorway-selector-align: start;
		--colorway-name-font-size: 2.5em;
		@@ -47,8 +47,6 @@

		@media (min-width: 50em) {
		:root {
		--body-columns: 1em repeat(2, 1fr);

		--figure-height: 300px;
		--figure-width: 300px;
		}
		@@ -114,7 +112,7 @@ figure {
		align-items: center;
		justify-content: center;

		margin: 1em 0 0;
		margin: 1em 1.5em 0;
		min-width: var(--figure-width);
		min-height: var(--figure-height);
		}
		@@ -188,6 +186,7 @@ figure > img {
		#colorway-description {
		font-size: 1.1em;
		line-height: 1.5;
		flex: 2;
		}

		/* Intensity Picker */

browser/components/colorways/jar.mn

+0 −2

Original line number	Diff line number	Diff line
		@@ -6,6 +6,4 @@ browser.jar:
		content/browser/colorways/colorwaycloset.html
		content/browser/colorways/colorwaycloset.css
		content/browser/colorways/colorwaycloset.js
		#ifdef EARLY_BETA_OR_EARLIER
		content/browser/colorways/assets/ (assets/*.avif)
		#endif