[tbb-commits] [tor-browser] 08/33: fixup! squash! Bug 27476: Implement about:torconnect captive portal within Tor Browser

[gitolite role]

This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch tor-browser-91.9.0esr-11.5-1
in repository tor-browser.

commit efd187eb3da2aaa10bad2cd705c906e9106b22fb
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Thu Apr 7 15:31:36 2022 +0200

    fixup! squash! Bug 27476: Implement about:torconnect captive portal within Tor Browser
    
    Bug 40877: hide #viewLinkContainer rather than its child element
---
 .../components/torconnect/content/aboutTorConnect.js    | 17 ++++++++++-------
 .../components/torconnect/content/aboutTorConnect.xhtml |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/browser/components/torconnect/content/aboutTorConnect.js b/browser/components/torconnect/content/aboutTorConnect.js
index 3d66913ab1c97..efea3c237470e 100644
--- a/browser/components/torconnect/content/aboutTorConnect.js
+++ b/browser/components/torconnect/content/aboutTorConnect.js
@@ -41,6 +41,7 @@ class AboutTorConnect {
       },
     },
     viewLog: {
+      container: "#viewLogContainer",
       link: "span#viewLogLink",
     },
     quickstart: {
@@ -92,6 +93,7 @@ class AboutTorConnect {
     tryBridgeLabel: document.querySelector(
       this.selectors.breadcrumbs.tryBridge.label
     ),
+    viewLogContainer: document.querySelector(this.selectors.viewLog.container),
     viewLogLink: document.querySelector(this.selectors.viewLog.link),
     quickstartContainer: document.querySelector(
       this.selectors.quickstart.container
@@ -331,7 +333,7 @@ class AboutTorConnect {
       showProgressbar
     );
     this.hide(this.elements.quickstartContainer);
-    this.hide(this.elements.viewLogLink);
+    this.hide(this.elements.viewLogContainer);
     this.hideButtons();
   }
 
@@ -340,7 +342,7 @@ class AboutTorConnect {
     const showProgressbar = false;
 
     this.hide(this.elements.quickstartContainer);
-    this.hide(this.elements.viewLogLink);
+    this.hide(this.elements.viewLogContainer);
     this.hideButtons();
 
     if (hasError) {
@@ -402,9 +404,9 @@ class AboutTorConnect {
       BreadcrumbStatus.Active
     );
     if (state.ShowViewLog) {
-      this.show(this.elements.viewLogLink);
+      this.show(this.elements.viewLogContainer);
     } else {
-      this.hide(this.elements.viewLogLink);
+      this.hide(this.elements.viewLogContainer);
     }
     this.hideButtons();
     this.show(this.elements.cancelButton, true);
@@ -421,9 +423,9 @@ class AboutTorConnect {
     this.setProgress("", showProgressbar, state.BootstrapProgress);
     this.hideBreadcrumbs();
     if (state.ShowViewLog) {
-      this.show(this.elements.viewLogLink);
+      this.show(this.elements.viewLogContainer);
     } else {
-      this.hide(this.elements.viewLogLink);
+      this.hide(this.elements.viewLogContainer);
     }
     this.hideButtons();
     this.show(this.elements.cancelButton, true);
@@ -439,7 +441,7 @@ class AboutTorConnect {
     this.setLongText("");
     this.setProgress(state.ErrorDetails, showProgressbar);
     this.hideButtons();
-    this.show(this.elements.viewLogLink);
+    this.show(this.elements.viewLogContainer);
   }
 
   update_Bootstrapped(state) {
@@ -563,6 +565,7 @@ class AboutTorConnect {
     this.elements.tryBridgeLabel.textContent =
       TorStrings.torConnect.breadcrumbTryBridge;
 
+    this.hide(this.elements.viewLogContainer);
     this.elements.viewLogLink.textContent = TorStrings.torConnect.viewLog;
     this.elements.viewLogLink.addEventListener("click", event => {
       RPMSendAsyncMessage("torconnect:view-tor-logs");
diff --git a/browser/components/torconnect/content/aboutTorConnect.xhtml b/browser/components/torconnect/content/aboutTorConnect.xhtml
index a98af43e2d53f..0591ed03a540c 100644
--- a/browser/components/torconnect/content/aboutTorConnect.xhtml
+++ b/browser/components/torconnect/content/aboutTorConnect.xhtml
@@ -37,7 +37,7 @@
         </div>
 
         <div id="viewLogContainer">
-          <span id="viewLogLink" hidden="true"></span>
+          <span id="viewLogLink"></span>
         </div>
 
         <div id="quickstartContainer">

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.