tor-browser

commit d40db3bf2fe9c13e3858bd05f6f904572185a087
parent ebac7cf204cd52df124e117a9d2f03b4a1be000e
Author: Dão Gottwald <dao@mozilla.com>
Date:   Wed, 19 Nov 2025 15:34:30 +0000

Bug 1999753 - Fix search go button. r=mbeier

Differential Revision: https://phabricator.services.mozilla.com/D273198

Diffstat:
M
browser/base/content/navigator-toolbox.js
 | 
5
-----
M
browser/components/urlbar/content/UrlbarInput.mjs
 | 
51
++++++++++++++++++++++++++++-----------------------

2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/browser/base/content/navigator-toolbox.js b/browser/base/content/navigator-toolbox.js
@@ -183,7 +183,6 @@ document.addEventListener(
         #back-button,
         #forward-button,
         #reload-button ,
-        #urlbar-go-button,
         #reader-mode-button,
         #picture-in-picture-button,
         #urlbar-zoom-button,
@@ -215,10 +214,6 @@ document.addEventListener(
           checkForMiddleClick(element, event);
           break;
 
-        case "urlbar-go-button":
-          gURLBar.handleCommand(event);
-          break;
-
         case "reader-mode-button":
           if (isLeftClick) {
             AboutReaderParent.toggleReaderMode(event);
diff --git a/browser/components/urlbar/content/UrlbarInput.mjs b/browser/components/urlbar/content/UrlbarInput.mjs
@@ -137,8 +137,7 @@ export class UrlbarInput extends HTMLElement {
                       data-l10n-id="urlbar-placeholder"/>
         </moz-input-box>
         <moz-urlbar-slot name="revert-button"> </moz-urlbar-slot>
-        <image id="urlbar-go-button"
-               class="urlbar-icon urlbar-go-button"
+        <image class="urlbar-icon urlbar-go-button"
                role="button"
                data-l10n-id="urlbar-go-button"/>
         <moz-urlbar-slot name="page-actions" hidden=""> </moz-urlbar-slot>
@@ -4640,29 +4639,35 @@ export class UrlbarInput extends HTMLElement {
   }
 
   _on_click(event) {
-    if (
-      event.target == this.inputField ||
-      event.target == this._inputContainer
-    ) {
-      this._maybeSelectAll();
-      this.#maybeUntrimUrl();
-    }
+    switch (event.target) {
+      case this.inputField:
+      case this._inputContainer:
+        this._maybeSelectAll();
+        this.#maybeUntrimUrl();
+        break;
 
-    if (event.target == this._searchModeIndicatorClose && event.button != 2) {
-      this.searchMode = null;
-      if (this.view.oneOffSearchButtons) {
-        this.view.oneOffSearchButtons.selectedButton = null;
-      }
-      if (this.view.isOpen) {
-        this.startQuery({
-          event,
-        });
-      }
-    }
+      case this._searchModeIndicatorClose:
+        if (event.button != 2) {
+          this.searchMode = null;
+          if (this.view.oneOffSearchButtons) {
+            this.view.oneOffSearchButtons.selectedButton = null;
+          }
+          if (this.view.isOpen) {
+            this.startQuery({
+              event,
+            });
+          }
+        }
+        break;
 
-    if (event.target == this._revertButton) {
-      this.handleRevert();
-      this.select();
+      case this._revertButton:
+        this.handleRevert();
+        this.select();
+        break;
+
+      case this.goButton:
+        this.handleCommand(event);
+        break;
     }
   }