2022-10-20 17:49:50 -05:00
|
|
|
diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm
|
2022-10-29 10:41:58 -05:00
|
|
|
index 30c9145..5e0eda8 100644
|
2022-10-20 17:49:50 -05:00
|
|
|
--- a/browser/components/customizableui/CustomizableUI.jsm
|
|
|
|
+++ b/browser/components/customizableui/CustomizableUI.jsm
|
2022-10-29 10:41:58 -05:00
|
|
|
@@ -274,7 +274,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",
|
2022-10-29 10:41:58 -05:00
|
|
|
@@ -602,18 +601,6 @@ var CustomizableUIInternal = {
|
2022-10-20 17:49:50 -05:00
|
|
|
navbarPlacements.splice(newPosition, 0, "save-to-pocket-button");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
-
|
|
|
|
- // 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");
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
},
|
|
|
|
|
|
|
|
_updateForNewProtonVersion() {
|
|
|
|
diff --git a/browser/components/firefoxview/firefoxview.html b/browser/components/firefoxview/firefoxview.html
|
2022-10-29 10:41:58 -05:00
|
|
|
index 2fe5208..057481b 100644
|
2022-10-20 17:49:50 -05:00
|
|
|
--- a/browser/components/firefoxview/firefoxview.html
|
|
|
|
+++ b/browser/components/firefoxview/firefoxview.html
|
|
|
|
@@ -113,7 +113,7 @@
|
|
|
|
</div>
|
|
|
|
</template>
|
|
|
|
|
|
|
|
- <details class="content-container" is="tab-pickup-container" id="tab-pickup-container" open>
|
|
|
|
+ <details class="content-container" is="tab-pickup-container" id="tab-pickup-container" open hidden="true">
|
|
|
|
<summary class="page-section-header">
|
|
|
|
<h1 id="collapsible-synced-tabs-header" data-l10n-id="firefoxview-tabpickup-header"></h1>
|
|
|
|
<span class="twisty icon" data-l10n-id="firefoxview-collapse-button-hide" aria-role="presentation"></span>
|
|
|
|
@@ -141,7 +141,7 @@
|
|
|
|
</div>
|
|
|
|
</details>
|
|
|
|
|
2022-11-15 09:51:14 -05:00
|
|
|
- <aside id="colorway-landmark" class="content-container" is="colorways-card">
|
2022-10-20 17:49:50 -05:00
|
|
|
+ <aside id="colorway-landmark" class="content-container" is="colorways-card" hidden="true">
|
|
|
|
<template id="colorways-no-collection-template">
|
|
|
|
<div class="content-container">
|
|
|
|
<div id="no-current-colorway-collection-notice" data-l10n-id="firefoxview-no-current-colorway-collection"></div>
|
|
|
|
diff --git a/browser/components/firefoxview/firefoxview.mjs b/browser/components/firefoxview/firefoxview.mjs
|
2022-10-29 10:41:58 -05:00
|
|
|
index 520c092..c0b2669 100644
|
2022-10-20 17:49:50 -05:00
|
|
|
--- a/browser/components/firefoxview/firefoxview.mjs
|
|
|
|
+++ b/browser/components/firefoxview/firefoxview.mjs
|
2022-10-29 10:41:58 -05:00
|
|
|
@@ -4,7 +4,26 @@
|
|
|
|
|
|
|
|
"use strict";
|
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;
|
|
|
|
+ document.getElementById("colorway-landmark").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));
|
|
|
|
+
|
2022-10-29 10:41:58 -05:00
|
|
|
window.addEventListener("DOMContentLoaded", async () => {
|
2022-10-20 17:49:50 -05:00
|
|
|
+ onPrefChange();
|
|
|
|
Services.telemetry.setEventRecordingEnabled("firefoxview", true);
|
|
|
|
Services.telemetry.recordEvent("firefoxview", "entered", "firefoxview", null);
|
|
|
|
document.getElementById("recently-closed-tabs-container").onLoad();
|
2022-10-22 06:55:59 -05:00
|
|
|
diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
|
2022-10-29 10:41:58 -05:00
|
|
|
index 616839d..f849f60 100644
|
2022-10-22 06:55:59 -05:00
|
|
|
--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
|
|
|
|
+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
|
2022-10-29 10:41:58 -05:00
|
|
|
@@ -78,56 +78,6 @@ const BASE_MESSAGES = () => [
|
|
|
|
},
|
2022-10-22 06:55:59 -05:00
|
|
|
trigger: { id: "protectionsPanelOpen" },
|
|
|
|
},
|
2022-10-29 10:41:58 -05:00
|
|
|
- {
|
2022-10-22 06:55:59 -05:00
|
|
|
- id: "CFR_FIREFOX_VIEW",
|
|
|
|
- groups: ["cfr"],
|
|
|
|
- template: "cfr_doorhanger",
|
|
|
|
- content: {
|
|
|
|
- bucket_id: "CFR_FIREFOX_VIEW",
|
|
|
|
- anchor_id: "firefox-view-button",
|
|
|
|
- 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: {
|
|
|
|
- string_id: "firefoxview-cfr-header",
|
|
|
|
- },
|
|
|
|
- text: {
|
|
|
|
- string_id: "firefoxview-cfr-body",
|
|
|
|
- },
|
|
|
|
- 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.
|
|
|
|
- targeting:
|
|
|
|
- "!inMr2022Holdback && (currentDate|date - profileAgeCreated) / 86400000 >= 2 && tabsClosedCount >= 3 && 'browser.firefox-view.view-count'|preferenceValue == 0 && !'browser.newtabpage.activity-stream.asrouter.providers.cfr'|preferenceIsUserSet",
|
|
|
|
- },
|
2022-10-29 10:41:58 -05:00
|
|
|
{
|
2022-10-22 06:55:59 -05:00
|
|
|
id: "FX_MR_106_UPGRADE",
|
|
|
|
template: "spotlight",
|
2022-11-10 17:09:49 -05:00
|
|
|
diff --git a/toolkit/components/nimbus/FeatureManifest.yaml b/toolkit/components/nimbus/FeatureManifest.yaml
|
|
|
|
--- a/toolkit/components/nimbus/FeatureManifest.yaml
|
|
|
|
+++ b/toolkit/components/nimbus/FeatureManifest.yaml
|
|
|
|
@@ -638,10 +638,6 @@ majorRelease2022:
|
|
|
|
type: boolean
|
|
|
|
fallbackPref: "browser.theme.colorway-closet"
|
|
|
|
description: "Whether or not to show the colorway closet modal"
|
|
|
|
- firefoxView:
|
|
|
|
- type: boolean
|
|
|
|
- fallbackPref: "browser.tabs.firefox-view"
|
|
|
|
- description: "Whether or not to show the firefox view tab"
|
|
|
|
onboarding:
|
|
|
|
type: boolean
|
|
|
|
fallbackPref: "browser.majorrelease.onboarding"
|