2023-10-27 02:45:04 -05:00
|
|
|
x# LibreWolf firefox-view.patch
|
2023-01-18 18:07:26 -05:00
|
|
|
#
|
|
|
|
# Author: Malte Jürgens <maltejur@dismail.de>
|
|
|
|
# Description: Hide "Firefox View" by default and make it work with LibreWolf
|
2023-03-15 06:10:20 -05:00
|
|
|
# Last Updated: 2023-03-15
|
2023-01-18 18:07:26 -05:00
|
|
|
# License: MPL 2.0
|
|
|
|
#
|
|
|
|
# This patch removes the Firefox View from the toolbar by default. Users can
|
|
|
|
# enable it again by using the "Customize Toolbar" mode and dragging it back to
|
|
|
|
# the titlebar.
|
|
|
|
#
|
|
|
|
# Colorways are hidden by default and can be enabled again by setting
|
|
|
|
# `librewolf.firefoxView.hideColorways` to `false`.
|
|
|
|
#
|
|
|
|
# The tab pickup feature is hidden if Firefox Sync is disabled. It can also
|
|
|
|
# be forced to always be disabled by setting `librewolf.firefoxView.hideTabPickup`
|
|
|
|
# to `true`.
|
2022-12-14 07:33:59 -05:00
|
|
|
--- a/browser/base/content/navigator-toolbox.inc.xhtml
|
|
|
|
+++ b/browser/base/content/navigator-toolbox.inc.xhtml
|
|
|
|
@@ -41,16 +41,6 @@
|
|
|
|
<hbox flex="1" align="end" class="toolbar-items">
|
|
|
|
<toolbartabstop/>
|
|
|
|
<hbox id="TabsToolbar-customization-target" flex="1">
|
|
|
|
- <toolbarbutton id="firefox-view-button"
|
|
|
|
- class="toolbarbutton-1 chromeclass-toolbar-additional"
|
2023-10-27 02:45:04 -05:00
|
|
|
- data-l10n-id="toolbar-button-firefox-view-2"
|
2022-12-14 07:33:59 -05:00
|
|
|
- role="button"
|
|
|
|
- aria-pressed="false"
|
|
|
|
- oncommand="FirefoxViewHandler.openTab(event);"
|
|
|
|
- onmousedown="FirefoxViewHandler.openTab(event);"
|
|
|
|
- cui-areatype="toolbar"
|
|
|
|
- removable="true"/>
|
|
|
|
-
|
|
|
|
<tabs id="tabbrowser-tabs"
|
|
|
|
is="tabbrowser-tabs"
|
|
|
|
flex="1"
|
2023-03-15 06:10:20 -05:00
|
|
|
@@ -707,6 +697,16 @@
|
2022-12-14 07:33:59 -05:00
|
|
|
closemenu="none"
|
|
|
|
cui-areatype="toolbar"
|
|
|
|
data-l10n-id="navbar-library"/>
|
|
|
|
+
|
|
|
|
+ <toolbarbutton id="firefox-view-button"
|
|
|
|
+ class="toolbarbutton-1 chromeclass-toolbar-additional"
|
2023-10-27 02:45:04 -05:00
|
|
|
+ data-l10n-id="toolbar-button-firefox-view-2"
|
2022-12-14 07:33:59 -05:00
|
|
|
+ role="button"
|
|
|
|
+ aria-pressed="false"
|
|
|
|
+ oncommand="FirefoxViewHandler.openTab(event);"
|
|
|
|
+ onmousedown="FirefoxViewHandler.openTab(event);"
|
|
|
|
+ cui-areatype="toolbar"
|
|
|
|
+ removable="true"/>
|
|
|
|
</html:template>
|
|
|
|
</toolbox>
|
|
|
|
</box>
|
2023-07-05 09:24:28 -05:00
|
|
|
--- a/browser/components/customizableui/CustomizableUI.sys.mjs
|
|
|
|
+++ b/browser/components/customizableui/CustomizableUI.sys.mjs
|
2023-03-15 06:10:20 -05:00
|
|
|
@@ -289,7 +289,6 @@ var CustomizableUIInternal = {
|
2022-10-20 17:49:50 -05:00
|
|
|
{
|
|
|
|
type: CustomizableUI.TYPE_TOOLBAR,
|
|
|
|
defaultPlacements: [
|
|
|
|
- "firefox-view-button",
|
|
|
|
"tabbrowser-tabs",
|
|
|
|
"new-tab-button",
|
|
|
|
"alltabs-button",
|
2023-03-15 06:10:20 -05:00
|
|
|
@@ -620,18 +619,6 @@ var CustomizableUIInternal = {
|
2022-10-20 17:49:50 -05:00
|
|
|
}
|
|
|
|
}
|
2023-03-15 06:10:20 -05:00
|
|
|
|
2022-10-20 17:49:50 -05:00
|
|
|
- // Add firefox-view if not present
|
|
|
|
- if (currentVersion < 18) {
|
|
|
|
- let tabstripPlacements =
|
|
|
|
- gSavedState.placements[CustomizableUI.AREA_TABSTRIP];
|
|
|
|
- if (
|
|
|
|
- tabstripPlacements &&
|
|
|
|
- !tabstripPlacements.includes("firefox-view-button")
|
|
|
|
- ) {
|
|
|
|
- tabstripPlacements.unshift("firefox-view-button");
|
|
|
|
- }
|
|
|
|
- }
|
2023-03-15 06:10:20 -05:00
|
|
|
-
|
|
|
|
// Unified Extensions addon button migration, which puts any browser action
|
|
|
|
// buttons in the overflow menu into the addons panel instead.
|
|
|
|
if (currentVersion < 19) {
|
2022-10-20 17:49:50 -05:00
|
|
|
--- a/browser/components/firefoxview/firefoxview.html
|
|
|
|
+++ b/browser/components/firefoxview/firefoxview.html
|
2023-07-05 09:24:28 -05:00
|
|
|
@@ -62,6 +62,7 @@
|
|
|
|
is="tab-pickup-container"
|
|
|
|
id="tab-pickup-container"
|
|
|
|
open
|
|
|
|
+ hidden
|
|
|
|
>
|
2022-10-20 17:49:50 -05:00
|
|
|
<summary class="page-section-header">
|
2023-07-05 09:24:28 -05:00
|
|
|
<span
|
2023-10-27 02:45:04 -05:00
|
|
|
diff --git a/browser/components/firefoxview/firefoxview.mjs b/browser/components/firefoxview/firefoxview.mjs
|
|
|
|
index e30e6c4..d3bd77a 100644
|
2022-10-20 17:49:50 -05:00
|
|
|
--- a/browser/components/firefoxview/firefoxview.mjs
|
|
|
|
+++ b/browser/components/firefoxview/firefoxview.mjs
|
2023-10-27 02:45:04 -05:00
|
|
|
@@ -2,7 +2,28 @@
|
|
|
|
* 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/. */
|
2022-10-20 17:49:50 -05:00
|
|
|
|
2023-10-27 02:45:04 -05:00
|
|
|
+
|
2022-10-20 17:49:50 -05:00
|
|
|
+function onPrefChange() {
|
|
|
|
+ document.getElementById("tab-pickup-container").hidden =
|
|
|
|
+ Services.prefs.getBoolPref("identity.fxaccounts.enabled") &&
|
2022-10-23 04:09:51 -05:00
|
|
|
+ !Services.prefs.getBoolPref("librewolf.firefoxView.hideTabPickup", false)
|
2022-10-20 17:49:50 -05:00
|
|
|
+ ? false
|
|
|
|
+ : true;
|
2023-01-16 15:42:59 -05:00
|
|
|
+ document.getElementById("colorways").hidden =
|
2022-10-23 04:09:51 -05:00
|
|
|
+ !Services.prefs.getBoolPref("librewolf.firefoxView.hideColorways", true)
|
2022-10-20 17:49:50 -05:00
|
|
|
+ ? false
|
|
|
|
+ : true;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+[
|
2022-10-23 04:09:51 -05:00
|
|
|
+ "librewolf.firefoxView.hideTabPickup",
|
|
|
|
+ "librewolf.firefoxView.hideColorways",
|
2022-10-20 17:49:50 -05:00
|
|
|
+ "identity.fxaccounts.enabled",
|
|
|
|
+].forEach((pref) => Services.prefs.addObserver(pref, onPrefChange));
|
2023-10-27 02:45:04 -05:00
|
|
|
+
|
2022-10-20 17:49:50 -05:00
|
|
|
+
|
2022-10-29 10:41:58 -05:00
|
|
|
window.addEventListener("DOMContentLoaded", async () => {
|
2022-10-20 17:49:50 -05:00
|
|
|
+ onPrefChange();
|
|
|
|
Services.telemetry.recordEvent("firefoxview", "entered", "firefoxview", null);
|
2023-10-27 02:45:04 -05:00
|
|
|
if (Cu.isInAutomation) {
|
|
|
|
Services.obs.notifyObservers(null, "firefoxview-entered");
|
2022-10-22 06:55:59 -05:00
|
|
|
--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
|
|
|
|
+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
|
2023-03-15 06:10:20 -05:00
|
|
|
@@ -92,57 +92,6 @@ const BASE_MESSAGES = () => [
|
2022-12-14 07:33:59 -05:00
|
|
|
},
|
2022-10-22 06:55:59 -05:00
|
|
|
trigger: { id: "protectionsPanelOpen" },
|
|
|
|
},
|
2022-12-14 07:33:59 -05:00
|
|
|
- {
|
2022-10-22 06:55:59 -05:00
|
|
|
- id: "CFR_FIREFOX_VIEW",
|
|
|
|
- groups: ["cfr"],
|
|
|
|
- template: "cfr_doorhanger",
|
2022-12-14 07:33:59 -05:00
|
|
|
- //If Firefox View button has been moved to the overflow menu, we want to change the anchor element
|
2022-10-22 06:55:59 -05:00
|
|
|
- content: {
|
|
|
|
- bucket_id: "CFR_FIREFOX_VIEW",
|
|
|
|
- anchor_id: "firefox-view-button",
|
2022-12-14 07:33:59 -05:00
|
|
|
- alt_anchor_id: "nav-bar-overflow-button",
|
2022-10-22 06:55:59 -05:00
|
|
|
- layout: "icon_and_message",
|
|
|
|
- icon: "chrome://browser/content/cfr-lightning.svg",
|
|
|
|
- icon_dark_theme: "chrome://browser/content/cfr-lightning-dark.svg",
|
|
|
|
- icon_class: "cfr-doorhanger-small-icon",
|
|
|
|
- heading_text: {
|
2023-01-16 15:42:59 -05:00
|
|
|
- string_id: "firefoxview-cfr-header-v2",
|
2022-10-22 06:55:59 -05:00
|
|
|
- },
|
|
|
|
- text: {
|
2023-01-16 15:42:59 -05:00
|
|
|
- string_id: "firefoxview-cfr-body-v2",
|
2022-10-22 06:55:59 -05:00
|
|
|
- },
|
|
|
|
- buttons: {
|
|
|
|
- primary: {
|
|
|
|
- label: {
|
|
|
|
- string_id: "firefoxview-cfr-primarybutton",
|
|
|
|
- },
|
|
|
|
- action: {
|
|
|
|
- type: "OPEN_FIREFOX_VIEW",
|
|
|
|
- navigate: true,
|
|
|
|
- },
|
|
|
|
- },
|
|
|
|
- secondary: [
|
|
|
|
- {
|
|
|
|
- label: {
|
|
|
|
- string_id: "firefoxview-cfr-secondarybutton",
|
|
|
|
- },
|
|
|
|
- action: {
|
|
|
|
- type: "CANCEL",
|
|
|
|
- },
|
|
|
|
- },
|
|
|
|
- ],
|
|
|
|
- },
|
|
|
|
- skip_address_bar_notifier: true,
|
|
|
|
- },
|
|
|
|
- frequency: {
|
|
|
|
- lifetime: 1,
|
|
|
|
- },
|
|
|
|
- trigger: {
|
|
|
|
- id: "nthTabClosed",
|
|
|
|
- },
|
|
|
|
- // Avoid breaking existing tests that close tabs for now.
|
2022-12-14 07:33:59 -05:00
|
|
|
- targeting: `!inMr2022Holdback && fxViewButtonAreaType != null && (currentDate|date - profileAgeCreated) / 86400000 >= 2 && tabsClosedCount >= 3 && 'browser.firefox-view.view-count'|preferenceValue == 0 && !'browser.newtabpage.activity-stream.asrouter.providers.cfr'|preferenceIsUserSet`,
|
2022-10-22 06:55:59 -05:00
|
|
|
- },
|
2022-12-14 07:33:59 -05:00
|
|
|
{
|
2022-10-22 06:55:59 -05:00
|
|
|
id: "FX_MR_106_UPGRADE",
|
|
|
|
template: "spotlight",
|