[tbb-commits] [tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Bug 26962 - implement new features onboarding (part 2)."

[gk at torproject.org]

commit 681eefdd4234007f4984dd88abc2dfe10cbc2740
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Wed Mar 6 16:04:42 2019 -0500

    Revert "Bug 26962 - implement new features onboarding (part 2)."
    
    This reverts commit 73018a0de3eab8cf12f0b9554a7595b35ceaeb53.
---
 .../base/content/abouttbupdate/aboutTBUpdate.css   | 25 ----------------------
 .../base/content/abouttbupdate/aboutTBUpdate.js    |  9 +-------
 .../base/content/abouttbupdate/aboutTBUpdate.xhtml |  5 -----
 browser/base/content/tab-content.js                | 10 ---------
 .../locales/en-US/chrome/browser/aboutTBUpdate.dtd |  4 ----
 5 files changed, 1 insertion(+), 52 deletions(-)

diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.css b/browser/base/content/abouttbupdate/aboutTBUpdate.css
index dc42f8ff5f9e..90252d77a739 100644
--- a/browser/base/content/abouttbupdate/aboutTBUpdate.css
+++ b/browser/base/content/abouttbupdate/aboutTBUpdate.css
@@ -53,31 +53,6 @@ a {
   margin-bottom: 20px;
 }
 
-#new-features {
-  margin-bottom: 15px;
-  padding: 10px;
-  text-align: center;
-  /* swap text and background colors in this section */
-  color: var(--abouttor-bg-toron-color);
-  background-color: var(--abouttor-text-color);
-}
-
-#new-features-description {
-  margin: 15px auto;
-  max-width: 500px;
-  font-size: 85%;
-}
-
-#new-features button {
-  padding: 8px 20px;
-  border: none;
-  border-radius: 3px;
-  font-size: 90%;
-  color: var(--abouttor-text-color);
-  background-color: var(--abouttor-bg-toron-color);
-  cursor: pointer;
-}
-
 #changelog-container {
   margin: 0px 20px 20px 20px;
 }
diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.js b/browser/base/content/abouttbupdate/aboutTBUpdate.js
index fa8bd3241a28..8243647c5708 100644
--- a/browser/base/content/abouttbupdate/aboutTBUpdate.js
+++ b/browser/base/content/abouttbupdate/aboutTBUpdate.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, The Tor Project, Inc.
+// Copyright (c) 2015, The Tor Project, Inc.
 // See LICENSE for licensing information.
 //
 // vim: set sw=2 sts=2 ts=8 et syntax=javascript:
@@ -8,10 +8,3 @@ function init()
   let event = new CustomEvent("AboutTBUpdateLoad", { bubbles: true });
   document.dispatchEvent(event);
 }
-
-function showNewFeaturesOnboarding()
-{
-  let event = new CustomEvent("AboutTBUpdateNewFeaturesOnboarding",
-                              { bubbles: true });
-  document.dispatchEvent(event);
-}
diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml
index a046f2658a5a..fe8ed69b537f 100644
--- a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml
+++ b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml
@@ -28,11 +28,6 @@
 </div>
 </div>
 <br clear="all"/>
-<div id="new-features">
-  <div>&aboutTBUpdate.circuitDisplayHeading;</div>
-  <div id="new-features-description">&aboutTBUpdate.circuitDisplayDescription;</div>
-  <button onclick="showNewFeaturesOnboarding()">&aboutTBUpdate.learnMore;</button>
-</div>
 <div id="changelog-container">
 <div id="changelog-heading">&aboutTBUpdate.changeLogHeading;</div>
 <div id="changelog"></div>
diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js
index c0987dbc05c7..e0cf6747aaa4 100644
--- a/browser/base/content/tab-content.js
+++ b/browser/base/content/tab-content.js
@@ -359,8 +359,6 @@ AboutReaderListener.init();
 let AboutTBUpdateListener = {
   init: function(chromeGlobal) {
     chromeGlobal.addEventListener('AboutTBUpdateLoad', this, false, true);
-    chromeGlobal.addEventListener("AboutTBUpdateNewFeaturesOnboarding",
-                                  this, false, true);
   },
 
   get isAboutTBUpdate() {
@@ -375,9 +373,6 @@ let AboutTBUpdateListener = {
       case "AboutTBUpdateLoad":
         this.onPageLoad();
         break;
-      case "AboutTBUpdateNewFeaturesOnboarding":
-        this.onNewFeaturesOnboarding();
-        break;
       case "pagehide":
         this.onPageHide(aEvent);
         break;
@@ -411,11 +406,6 @@ let AboutTBUpdateListener = {
     removeEventListener("pagehide", this, true);
   },
 
-  onNewFeaturesOnboarding: function() {
-    // Tell the onboarding extension to open the circuit display onboarding.
-    sendAsyncMessage("Onboarding:OnContentMessage",
-                     {action: "tor-open-circuit-display-page"});
-  },
 };
 AboutTBUpdateListener.init(this);
 #endif
diff --git a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd
index f7b3f2ed8fcd..37567bd7e38c 100644
--- a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd
@@ -4,7 +4,3 @@
 <!ENTITY aboutTBUpdate.linkLabel  "visit our website">
 <!ENTITY aboutTBUpdate.linkSuffix ".">
 <!ENTITY aboutTBUpdate.changeLogHeading "Changelog:">
-
-<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display">
-<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display.">
-<!ENTITY aboutTBUpdate.learnMore "Learn More">