From d487ec1cc1a8537198e9251b9e9bd959bdede774 Mon Sep 17 00:00:00 2001 From: Tim Nguyen Date: Thu, 29 Aug 2019 05:09:36 +0000 Subject: [PATCH] Bug 1567548 - Remove references to Lockwise FAQ page. r=jaws,fluent-reviewers,flod Differential Revision: https://phabricator.services.mozilla.com/D43895 --HG-- extra : moz-landing-system : lando --- browser/app/profile/firefox.js | 2 -- browser/components/BrowserGlue.jsm | 1 - browser/components/aboutlogins/AboutLoginsChild.jsm | 4 ---- browser/components/aboutlogins/AboutLoginsParent.jsm | 8 -------- browser/components/aboutlogins/content/aboutLogins.html | 5 ++--- .../aboutlogins/content/components/login-intro.js | 6 +++--- .../aboutlogins/content/components/menu-button.css | 4 ---- .../tests/browser/browser_openPreferencesExternal.js | 6 ------ .../aboutlogins/tests/chrome/test_menu_button.html | 1 - browser/locales/en-US/browser/aboutLogins.ftl | 3 +-- 10 files changed, 6 insertions(+), 34 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index d364328aad02..783162faa9ea 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -1784,7 +1784,6 @@ pref("signon.management.overrideURI", "about:logins?filter=%DOMAIN%"); pref("signon.showAutoCompleteOrigins", true); pref("signon.includeOtherSubdomainsInLookup", true); #endif -pref("signon.management.page.faqURL", "https://lockwise.firefox.com/faq.html"); // The utm_creative value is appended within the code (specific to the location on // where it is clicked). Be sure that if these two prefs are updated, that // the utm_creative param be last. @@ -2380,4 +2379,3 @@ pref("devtools.webide.lastConnectedRuntime", ""); pref("devtools.webide.lastSelectedProject", ""); pref("devtools.webide.zoom", "1"); pref("devtools.webide.busyTimeout", 10000); - diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index aafd32fba25b..6d0365c7c4af 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -143,7 +143,6 @@ let LEGACY_ACTORS = { AboutLoginsHideFooter: { wantUntrusted: true }, AboutLoginsImport: { wantUntrusted: true }, AboutLoginsInit: { wantUntrusted: true }, - AboutLoginsOpenFAQ: { wantUntrusted: true }, AboutLoginsGetHelp: { wantUntrusted: true }, AboutLoginsOpenMobileAndroid: { wantUntrusted: true }, AboutLoginsOpenMobileIos: { wantUntrusted: true }, diff --git a/browser/components/aboutlogins/AboutLoginsChild.jsm b/browser/components/aboutlogins/AboutLoginsChild.jsm index 8dc2f6e74e6d..c5ca28ce6f45 100644 --- a/browser/components/aboutlogins/AboutLoginsChild.jsm +++ b/browser/components/aboutlogins/AboutLoginsChild.jsm @@ -104,10 +104,6 @@ class AboutLoginsChild extends ActorChild { this.mm.sendAsyncMessage("AboutLogins:Import"); break; } - case "AboutLoginsOpenFAQ": { - this.mm.sendAsyncMessage("AboutLogins:OpenFAQ"); - break; - } case "AboutLoginsOpenMobileAndroid": { this.mm.sendAsyncMessage("AboutLogins:OpenMobileAndroid", { source: event.detail, diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm index ae1cb281a4a5..cfb8a0cb7f4e 100644 --- a/browser/components/aboutlogins/AboutLoginsParent.jsm +++ b/browser/components/aboutlogins/AboutLoginsParent.jsm @@ -156,14 +156,6 @@ var AboutLoginsParent = { }); break; } - case "AboutLogins:OpenFAQ": { - const FAQ_URL_PREF = "signon.management.page.faqURL"; - const FAQ_URL = Services.prefs.getStringPref(FAQ_URL_PREF); - message.target.ownerGlobal.openWebLinkIn(FAQ_URL, "tab", { - relatedToCurrent: true, - }); - break; - } case "AboutLogins:OpenMobileAndroid": { const MOBILE_ANDROID_URL_PREF = "signon.management.page.mobileAndroidURL"; diff --git a/browser/components/aboutlogins/content/aboutLogins.html b/browser/components/aboutlogins/content/aboutLogins.html index 8f2c62c90b53..926119e03bd3 100644 --- a/browser/components/aboutlogins/content/aboutLogins.html +++ b/browser/components/aboutlogins/content/aboutLogins.html @@ -130,8 +130,8 @@ @@ -235,7 +235,6 @@ - diff --git a/browser/components/aboutlogins/content/components/login-intro.js b/browser/components/aboutlogins/content/components/login-intro.js index 44796a865577..3d875eca2c42 100644 --- a/browser/components/aboutlogins/content/components/login-intro.js +++ b/browser/components/aboutlogins/content/components/login-intro.js @@ -17,11 +17,11 @@ export default class LoginIntro extends HTMLElement { } handleEvent(event) { - let faqLink = this.shadowRoot.querySelector(".intro-faq-link"); + let helpLink = this.shadowRoot.querySelector(".intro-help-link"); - if (event.type == "click" && event.originalTarget == faqLink) { + if (event.type == "click" && event.originalTarget == helpLink) { document.dispatchEvent( - new CustomEvent("AboutLoginsOpenFAQ", { + new CustomEvent("AboutLoginsGetHelp", { bubbles: true, }) ); diff --git a/browser/components/aboutlogins/content/components/menu-button.css b/browser/components/aboutlogins/content/components/menu-button.css index bfd46c5dbea0..1af74f3faa70 100644 --- a/browser/components/aboutlogins/content/components/menu-button.css +++ b/browser/components/aboutlogins/content/components/menu-button.css @@ -73,10 +73,6 @@ background-image: url("chrome://browser/skin/settings.svg"); } -.menuitem-faq { - background-image: url("chrome://global/skin/icons/help.svg"); -} - .menuitem-mobile { background-image: url("chrome://browser/skin/device-phone.svg"); } diff --git a/browser/components/aboutlogins/tests/browser/browser_openPreferencesExternal.js b/browser/components/aboutlogins/tests/browser/browser_openPreferencesExternal.js index 43437c7f9fcb..586a1e002fec 100644 --- a/browser/components/aboutlogins/tests/browser/browser_openPreferencesExternal.js +++ b/browser/components/aboutlogins/tests/browser/browser_openPreferencesExternal.js @@ -19,12 +19,6 @@ add_task(async function test_open_feedback() { pref: "app.support.baseURL", selector: ".menuitem-help", }, - { - urlFinal: "https://example.com/faqs", - urlBase: "https://example.com/faqs", - pref: "signon.management.page.faqURL", - selector: ".menuitem-faq", - }, { urlFinal: "https://example.com/android?utm_creative=Elipsis_Menu", urlBase: "https://example.com/android?utm_creative=", diff --git a/browser/components/aboutlogins/tests/chrome/test_menu_button.html b/browser/components/aboutlogins/tests/chrome/test_menu_button.html index 3694448f613f..04744f13fffe 100644 --- a/browser/components/aboutlogins/tests/chrome/test_menu_button.html +++ b/browser/components/aboutlogins/tests/chrome/test_menu_button.html @@ -124,7 +124,6 @@ add_task(async function test_menu_keyboard_cycling() { let allItems = [ "menuitem-preferences", "menuitem-help", - "menuitem-faq", "menuitem-mobile-android", "menuitem-mobile-ios", ]; diff --git a/browser/locales/en-US/browser/aboutLogins.ftl b/browser/locales/en-US/browser/aboutLogins.ftl index 737c92da2ade..db66b5acfdea 100644 --- a/browser/locales/en-US/browser/aboutLogins.ftl +++ b/browser/locales/en-US/browser/aboutLogins.ftl @@ -41,7 +41,6 @@ menu-menuitem-preferences = *[other] Preferences } about-logins-menu-menuitem-help = Help -menu-menuitem-faq = Frequently Asked Questions menu-menuitem-android-app = { -lockwise-brand-short-name } for Android menu-menuitem-iphone-app = { -lockwise-brand-short-name } for iPhone and iPad @@ -73,7 +72,7 @@ login-intro-heading = Looking for your saved logins? Set up { -sync-brand-short- login-intro-description = If you saved your logins to { -brand-product-name } on a different device, here’s how to get them here: login-intro-instruction-fxa = Create or sign in to your { -fxaccount-brand-name } on the device where your logins are saved login-intro-instruction-fxa-settings = Make sure you’ve selected the Logins checkbox in { -sync-brand-short-name } Settings -login-intro-instruction-faq = Visit { -lockwise-brand-short-name } frequently asked questions for more help +about-logins-intro-instruction-help = Visit { -lockwise-brand-short-name } Support for more help ## Login