Commit 702051f1 authored by henry's avatar henry Committed by richard
Browse files

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

Bug 41608 and 41526 - Use KeyboardEvent.repeat to block triggering newly
focused buttons in about:torconnect. The approach in !607
prevented this by waiting for keyup, but keyup could still be triggered
by a key event initialized elsewhere. E.g. when pressing Enter to close
a modal dialog, the Enter's keyup event would be sent to the
about:torconnect page and trigger the focused button.
parent ba98c304

browser/components/torconnect/content/aboutTorConnect.js

+17 −14
Original line number Diff line number Diff line
@@ -769,26 +769,29 @@ class AboutTorConnect { 
      }

    });



    // Delay the "Enter" activation of the given button from "keydown" to

    // "keyup".

    // Prevent repeat triggering on keydown when the Enter key is held down.

    //

    // Without this, holding down Enter will continue to trigger the button

    // until the user stops holding. This means that a user can accidentally

    // re-trigger a button several times. This is particularly bad when the

    // focus gets moved to a new button, and the new button can get triggered

    // immediately. E.g. when the "Connect" button is triggered it disappears

    // and focus moves to the "Cancel" button.

    // Without this, holding down Enter will continue to trigger the button's

    // click event until the user stops holding. This means that a user can

    // accidentally re-trigger a button several times. And if focus moves to a

    // new button it can also get triggered, despite not receiving the initial

    // keydown event.

    //

    // E.g. If the user presses down Enter on the "Connect" button it will

    // trigger and focus will move to the "Cancel" button. This should prevent

    // the user accidentally triggering the "Cancel" button if they hold down

    // Enter for a little bit too long.

    for (const button of document.body.querySelectorAll("button")) {

      button.addEventListener("keydown", event => {

        if (event.key === "Enter") {

        // If the keydown is a repeating Enter event, ignore it.

        // NOTE: If firefox uses wayland display (rather than xwayland), the

        // "repeat" event is always "false" so this will not work.

        // See bugzilla bug 1784438. Also see bugzilla bug 1594003.

        // Currently tor browser uses xwayland by default on linux.

        if (event.key === "Enter" && event.repeat) {

          event.preventDefault();

        }

      });

      button.addEventListener("keyup", event => {

        if (event.key === "Enter") {

          button.click();

        }

      });

    }

  }