morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser
Commits:
-
c28ee632
by Henry Wilkes at 2024-09-18T18:05:17+00:00
-
4869b835
by Henry Wilkes at 2024-09-18T18:05:17+00:00
3 changed files:
- browser/app/profile/001-base-profile.js
- browser/base/content/browser.js
- browser/themes/shared/tabbrowser/tabs.css
Changes:
| ... | ... | @@ -17,9 +17,6 @@ pref("startup.homepage_welcome_url.additional", ""); |
| 17 | 17 | // Disable Firefox Welcome Dialog
|
| 18 | 18 | pref("browser.aboutwelcome.enabled", false);
|
| 19 | 19 | |
| 20 | -// Disable the Firefox View tab (tor-browser#41876)
|
|
| 21 | -pref("browser.tabs.firefox-view", false, locked);
|
|
| 22 | - |
|
| 23 | 20 | #if MOZ_UPDATE_CHANNEL == release
|
| 24 | 21 | // tor-browser#42640: Disable Firefox Flame buttond due to unknown interactions with New Identity
|
| 25 | 22 | pref("browser.privatebrowsing.resetPBM.enabled", false, locked);
|
| ... | ... | @@ -8121,6 +8121,11 @@ var FirefoxViewHandler = { |
| 8121 | 8121 | }
|
| 8122 | 8122 | },
|
| 8123 | 8123 | openTab(section) {
|
| 8124 | + if (AppConstants.BASE_BROWSER_VERSION) {
|
|
| 8125 | + // about:firefoxview is disabled. tor-browser#42037.
|
|
| 8126 | + return;
|
|
| 8127 | + }
|
|
| 8128 | + |
|
| 8124 | 8129 | if (!CustomizableUI.getPlacementOfWidget(this.BUTTON_ID)) {
|
| 8125 | 8130 | CustomizableUI.addWidgetToArea(
|
| 8126 | 8131 | this.BUTTON_ID,
|
| ... | ... | @@ -747,17 +747,28 @@ |
| 747 | 747 | |
| 748 | 748 | /* Firefox View button and menu item */
|
| 749 | 749 | |
| 750 | -:root:not([privatebrowsingmode], [firefoxviewhidden]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs,
|
|
| 751 | -:root[privatebrowsingmode]:not([firefoxviewhidden]) :is(
|
|
| 750 | +/* about:firefoxview is disabled in Base Browser. See tor-browser#42037.
|
|
| 751 | + * Therefore we always hide #firefox-view-button, regardless of private
|
|
| 752 | + * browsing. Here we only want to draw the border if there is a non-hidden
|
|
| 753 | + * toolbar item before the tabs.
|
|
| 754 | + * NOTE: Expect merge conflict from bugzilla bug 1917595 and bug 1917599. In
|
|
| 755 | + * these cases we want to keep our selector as-is. */
|
|
| 756 | +:root :is(
|
|
| 752 | 757 | toolbarbutton:not(#firefox-view-button),
|
| 753 | 758 | toolbarpaletteitem:not(#wrapper-firefox-view-button)
|
| 754 | -) + #tabbrowser-tabs {
|
|
| 759 | +) ~ #tabbrowser-tabs {
|
|
| 755 | 760 | border-inline-start: 1px solid color-mix(in srgb, currentColor 25%, transparent);
|
| 756 | 761 | padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width) + 2px);
|
| 757 | 762 | margin-inline-start: 2px;
|
| 758 | 763 | }
|
| 759 | 764 | |
| 760 | -:root[privatebrowsingmode] :is(#firefox-view-button, #menu_openFirefoxView) {
|
|
| 765 | +/* about:firefoxview is disabled in Base Browser. Always hide the toolbar button
|
|
| 766 | + * and menu item regardless of private browsing. See tor-browser#42037.
|
|
| 767 | + * NOTE: We also hide #wrapper-firefox-view-button, which is used during
|
|
| 768 | + * customization.
|
|
| 769 | + * NOTE: Expect merge conflict from bugzilla bug 1903812 and bug 1917599. In
|
|
| 770 | + * these cases we want to keep our selector as-is. */
|
|
| 771 | +#firefox-view-button, #wrapper-firefox-view-button, #menu_openFirefoxView {
|
|
| 761 | 772 | display: none;
|
| 762 | 773 | }
|
| 763 | 774 |