From f3f9d9c811836ca37c313d00b441b7b1b8d1fb2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Fri, 11 Sep 2015 14:18:15 +0200
Subject: [PATCH] Bug 1139655 - pressing enter in the searchbar should ignore
 button selections from mouseover, r=Gijs.

---
 browser/components/search/content/search.xml  | 26 +++++++------------
 .../search/test/browser_oneOffHeader.js       |  3 +++
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/browser/components/search/content/search.xml b/browser/components/search/content/search.xml
index e06a714f0bc5..3be48078ff1d 100644
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -727,7 +727,7 @@
 
           let engine;
           let oneOff = this.selectedButton;
-          if (oneOff) {
+          if (oneOff && !this.selectionFromMouseOver) {
             if (!oneOff.engine) {
               oneOff.doCommand();
               this.mEnterEvent = null;
@@ -749,6 +749,9 @@
       <field name="_selectedButton"/>
       <property name="selectedButton" onget="return this._selectedButton;">
         <setter><![CDATA[
+          // Set to true from the mouseover handler right after this setter call.
+          this.selectionFromMouseOver = false;
+
           if (this._selectedButton)
             this._selectedButton.removeAttribute("selected");
 
@@ -1203,10 +1206,6 @@
         while (list.firstChild)
           list.firstChild.remove();
 
-        // Avoid setting the selection based on mouse events before
-        // the 'popupshown' event has fired.
-        this._ignoreMouseEvents = true;
-
         let Preferences =
           Cu.import("resource://gre/modules/Preferences.jsm", {}).Preferences;
         let pref = Preferences.get("browser.search.hiddenOneOffs");
@@ -1298,10 +1297,6 @@
         }
       ]]></handler>
 
-      <handler event="popupshown"><![CDATA[
-        this._ignoreMouseEvents = false;
-      ]]></handler>
-
       <handler event="mousedown"><![CDATA[
         // Required to receive click events from the buttons on Linux.
         event.preventDefault();
@@ -1312,17 +1307,14 @@
         if (target.localName != "button")
           return;
 
-        // We ignore mouse events between the popupshowing and popupshown
-        // events to avoid selecting the button that happens to be under the
-        // mouse when the panel opens.
-        if (this._ignoreMouseEvents)
-          return;
-
         if ((target.classList.contains("searchbar-engine-one-off-item") &&
              !target.classList.contains("dummy")) ||
             target.classList.contains("addengine-item") ||
-            target.classList.contains("search-setting-button"))
-          document.getElementById("searchbar").textbox.selectedButton = target;
+            target.classList.contains("search-setting-button")) {
+          let textbox = document.getElementById("searchbar").textbox;
+          textbox.selectedButton = target;
+          textbox.selectionFromMouseOver = true;
+        }
       ]]></handler>
 
       <handler event="mouseout"><![CDATA[
diff --git a/browser/components/search/test/browser_oneOffHeader.js b/browser/components/search/test/browser_oneOffHeader.js
index 3d27376ab2fd..b176d65e0dfa 100644
--- a/browser/components/search/test/browser_oneOffHeader.js
+++ b/browser/components/search/test/browser_oneOffHeader.js
@@ -138,4 +138,7 @@ add_task(function* test_text() {
   info("Closing search panel");
   EventUtils.synthesizeKey("VK_ESCAPE", {});
   yield promise;
+
+  // Move the cursor out of the panel area to avoid messing with other tests.
+  yield synthesizeNativeMouseMove(searchbar);
 });