From b109b14de63500ab07c478723d4851b345139bdd Mon Sep 17 00:00:00 2001 From: Ascrod <32915892+Ascrod@users.noreply.github.com> Date: Fri, 25 May 2018 06:53:37 -0400 Subject: Remove UITour and customize tips. --- browser/base/content/baseMenuOverlay.xul | 4 -- browser/base/content/browser-trackingprotection.js | 9 --- browser/base/content/browser.css | 65 ---------------------- browser/base/content/browser.js | 3 - browser/base/content/browser.xul | 36 ------------ browser/base/content/utilityOverlay.js | 7 --- 6 files changed, 124 deletions(-) (limited to 'browser/base') diff --git a/browser/base/content/baseMenuOverlay.xul b/browser/base/content/baseMenuOverlay.xul index da74ca077..546103de1 100644 --- a/browser/base/content/baseMenuOverlay.xul +++ b/browser/base/content/baseMenuOverlay.xul @@ -52,10 +52,6 @@ #else /> #endif - this.dontShowIntroPanelAgain() }); }), }; diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css index ac5bf9e9b..e951985dc 100644 --- a/browser/base/content/browser.css +++ b/browser/base/content/browser.css @@ -1152,71 +1152,6 @@ toolbarpaletteitem[place="palette"][hidden] { display: none; } -/* UI Tour */ - -@keyframes uitour-wobble { - from { - transform: rotate(0deg) translateX(3px) rotate(0deg); - } - 50% { - transform: rotate(360deg) translateX(3px) rotate(-360deg); - } - to { - transform: rotate(720deg) translateX(0px) rotate(-720deg); - } -} - -@keyframes uitour-zoom { - from { - transform: scale(0.8); - } - 50% { - transform: scale(1.0); - } - to { - transform: scale(0.8); - } -} - -@keyframes uitour-color { - from { - border-color: #5B9CD9; - } - 50% { - border-color: #FF0000; - } - to { - border-color: #5B9CD9; - } -} - -#UITourHighlightContainer, -#UITourHighlight { - pointer-events: none; -} - -#UITourHighlight[active] { - animation-delay: 2s; - animation-fill-mode: forwards; - animation-iteration-count: infinite; - animation-timing-function: linear; -} - -#UITourHighlight[active="wobble"] { - animation-name: uitour-wobble; - animation-delay: 0s; - animation-duration: 1.5s; - animation-iteration-count: 1; -} -#UITourHighlight[active="zoom"] { - animation-name: uitour-zoom; - animation-duration: 1s; -} -#UITourHighlight[active="color"] { - animation-name: uitour-color; - animation-duration: 2s; -} - /* Combined context-menu items */ #context-navigation > .menuitem-iconic > .menu-iconic-text, #context-navigation > .menuitem-iconic > .menu-accel-container { diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 4b8ec864b..e879f970f 100755 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -48,7 +48,6 @@ Cu.import("resource://gre/modules/NotificationDB.jsm"); ["Task", "resource://gre/modules/Task.jsm"], ["TelemetryStopwatch", "resource://gre/modules/TelemetryStopwatch.jsm"], ["Translation", "resource:///modules/translation/Translation.jsm"], - ["UITour", "resource:///modules/UITour.jsm"], ["UpdateUtils", "resource://gre/modules/UpdateUtils.jsm"], ["Weave", "resource://services-sync/main.js"], ["fxAccounts", "resource://gre/modules/FxAccounts.jsm"], @@ -984,7 +983,6 @@ var gBrowserInit = { let mm = window.getGroupMessageManager("browsers"); mm.loadFrameScript("chrome://browser/content/tab-content.js", true); mm.loadFrameScript("chrome://browser/content/content.js", true); - mm.loadFrameScript("chrome://browser/content/content-UITour.js", true); mm.loadFrameScript("chrome://global/content/manifestMessages.js", true); // initialize observers and listeners @@ -4474,7 +4472,6 @@ var XULBrowserWindow = { gIdentityHandler.onLocationChange(); - UITour.onLocationChange(location); gTabletModePageCounter.inc(); diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index 4f1b48349..028df609f 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -232,42 +232,6 @@ - - - - - Date: Thu, 31 May 2018 18:37:37 -0400 Subject: Remove tracking protection tour. --- browser/base/content/browser-trackingprotection.js | 53 ---------------------- browser/base/content/browser.js | 5 -- browser/base/content/tab-content.js | 5 -- 3 files changed, 63 deletions(-) (limited to 'browser/base') diff --git a/browser/base/content/browser-trackingprotection.js b/browser/base/content/browser-trackingprotection.js index 82743abbb..20917a083 100644 --- a/browser/base/content/browser-trackingprotection.js +++ b/browser/base/content/browser-trackingprotection.js @@ -4,7 +4,6 @@ var TrackingProtection = { // If the user ignores the doorhanger, we stop showing it after some time. - MAX_INTROS: 20, PREF_ENABLED_GLOBALLY: "privacy.trackingprotection.enabled", PREF_ENABLED_IN_PRIVATE_WINDOWS: "privacy.trackingprotection.pbmode.enabled", enabledGlobally: false, @@ -106,16 +105,6 @@ var TrackingProtection = { this.icon.setAttribute("state", "blocked-tracking-content"); this.content.setAttribute("state", "blocked-tracking-content"); - // Open the tracking protection introduction panel, if applicable. - if (this.enabledGlobally) { - let introCount = gPrefService.getIntPref("privacy.trackingprotection.introCount"); - if (introCount < TrackingProtection.MAX_INTROS) { - gPrefService.setIntPref("privacy.trackingprotection.introCount", ++introCount); - gPrefService.savePrefFile(null); - this.showIntroPanel(); - } - } - this.shieldHistogramAdd(2); } else if (isAllowing) { this.icon.setAttribute("tooltiptext", this.disabledTooltipText); @@ -185,46 +174,4 @@ var TrackingProtection = { BrowserReload(); }, - - dontShowIntroPanelAgain() { - // This function may be called in private windows, but it does not change - // any preference unless Tracking Protection is enabled globally. - if (this.enabledGlobally) { - gPrefService.setIntPref("privacy.trackingprotection.introCount", - this.MAX_INTROS); - gPrefService.savePrefFile(null); - } - }, - - showIntroPanel: Task.async(function*() { - let brandBundle = document.getElementById("bundle_brand"); - let brandShortName = brandBundle.getString("brandShortName"); - - let openStep2 = () => { - // When the user proceeds in the tour, adjust the counter to indicate that - // the user doesn't need to see the intro anymore. - this.dontShowIntroPanelAgain(); - - let nextURL = Services.urlFormatter.formatURLPref("privacy.trackingprotection.introURL") + - "?step=2&newtab=true"; - switchToTabHavingURI(nextURL, true, { - // Ignore the fragment in case the intro is shown on the tour page - // (e.g. if the user manually visited the tour or clicked the link from - // about:privatebrowsing) so we can avoid a reload. - ignoreFragment: "whenComparingAndReplace", - }); - }; - - let buttons = [ - { - label: gNavigatorBundle.getString("trackingProtection.intro.step1of3"), - style: "text", - }, - { - callback: openStep2, - label: gNavigatorBundle.getString("trackingProtection.intro.nextButton.label"), - style: "primary", - }, - ]; - }), }; diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index e879f970f..64c0d86f5 100755 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -8082,11 +8082,6 @@ var AboutPrivateBrowsingListener = { const PREF = "privacy.trackingprotection.pbmode.enabled"; Services.prefs.setBoolPref(PREF, !Services.prefs.getBoolPref(PREF)); }); - window.messageManager.addMessageListener( - "AboutPrivateBrowsing:DontShowIntroPanelAgain", - msg => { - TrackingProtection.dontShowIntroPanelAgain(); - }); } }; diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js index a57dc6607..11a9fabce 100644 --- a/browser/base/content/tab-content.js +++ b/browser/base/content/tab-content.js @@ -226,8 +226,6 @@ var AboutPrivateBrowsingListener = { false, true); chromeGlobal.addEventListener("AboutPrivateBrowsingToggleTrackingProtection", this, false, true); - chromeGlobal.addEventListener("AboutPrivateBrowsingDontShowIntroPanelAgain", this, - false, true); }, get isAboutPrivateBrowsing() { @@ -245,9 +243,6 @@ var AboutPrivateBrowsingListener = { case "AboutPrivateBrowsingToggleTrackingProtection": sendAsyncMessage("AboutPrivateBrowsing:ToggleTrackingProtection"); break; - case "AboutPrivateBrowsingDontShowIntroPanelAgain": - sendAsyncMessage("AboutPrivateBrowsing:DontShowIntroPanelAgain"); - break; } }, }; -- cgit v1.2.3