Commit d891a214 authored by henry's avatar henry Committed by Pier Angelo Vendrame
Browse files

fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser 

Bug 41850: Don't show tor connection animation for new windows.


(cherry picked from commit ba957145)
parent fc3e82b2

browser/components/torconnect/content/torConnectTitlebarStatus.css

+2 −2
Changes for browser/components/torconnect/content/torConnectTitlebarStatus.css: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -64,11 +64,11 @@ 
}



@media (prefers-reduced-motion: no-preference) {

  #tor-connect-titlebar-status.tor-connect-status-connected {

  #tor-connect-titlebar-status.tor-connect-status-connected.tor-connect-status-animate-transition {

    transition: color 1000ms;

  }



  #tor-connect-titlebar-status.tor-connect-status-connected img {

  #tor-connect-titlebar-status.tor-connect-status-connected.tor-connect-status-animate-transition img {

    animation-name: onion-not-connected-to-connected;

    animation-delay: 200ms;

    animation-fill-mode: both;

browser/components/torconnect/content/torConnectTitlebarStatus.js

+30 −0
Changes for browser/components/torconnect/content/torConnectTitlebarStatus.js: 30 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ var gTorConnectTitlebarStatus = { 
   * @type {Element}

   */

  label: null,

  /**

   * Whether we are connected, or null if the connection state is not yet known.

   *

   * @type {bool?}

   */

  connected: null,



  /**

   * Initialize the component.
@@ -84,7 +90,31 @@ var gTorConnectTitlebarStatus = { 
        break;

    }

    this.label.textContent = this._strings[textId];

    if (this.connected !== connected) {

      // When we are transitioning from

      //   this.connected = false

      // to

      //   this.connected = true

      // we want to animate the transition from the not connected state to the

      // connected state (provided prefers-reduced-motion is not set).

      //

      // If instead we are transitioning directly from the initial state

      //   this.connected = null

      // to

      //   this.connected = true

      // we want to immediately show the connected state without any transition.

      //

      // In both cases, the status will eventually be hidden.

      //

      // We only expect this latter case when opening a new window after

      // bootstrapping has already completed. See tor-browser#41850.

      this.node.classList.toggle(

        "tor-connect-status-animate-transition",

        connected && this.connected !== null

      );

      this.node.classList.toggle("tor-connect-status-connected", connected);

      this.connected = connected;

    }

    this.node.classList.toggle(

      "tor-connect-status-potentially-blocked",

      potentiallyBlocked