From 37d554b5c49807cc5eda746d4c6808e12a268505 Mon Sep 17 00:00:00 2001
From: "bryner%brianryner.com" <bryner%brianryner.com>
Date: Thu, 18 May 2006 22:46:50 +0000
Subject: [PATCH] Fix opening the search dropdown with F4 or alt+up/down (bug
 337720) Patch by pamg, r=gavin, sr/b181=me

---
 browser/base/content/browser.js               |   4 +--
 browser/components/search/content/search.xml  |  24 +++++-------------
 .../search/content/searchbarBindings.css      |   5 ----
 .../themes/pinstripe/browser/searchbar.css    |   4 ---
 browser/themes/winstripe/browser/jar.mn       |   1 -
 .../themes/winstripe/browser/search-arrow.gif | Bin 67 -> 0 bytes
 .../themes/winstripe/browser/searchbar.css    |  11 --------
 7 files changed, 8 insertions(+), 41 deletions(-)
 delete mode 100644 browser/themes/winstripe/browser/search-arrow.gif

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 7c9856092b6a..741093c86ef0 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -2930,7 +2930,7 @@ const BrowserSearch = {
       const targetDoc = target.ownerDocument;
       // Set the attribute of the (first) search button.
       var searchButton = document.getAnonymousElementByAttribute(this.getSearchBar(),
-                                  "anonid", "searchbar-dropmarker");
+                                  "anonid", "search-go-button");
       if (searchButton) {
         var browser = gBrowser.getBrowserForDocument(targetDoc);
          // Append the URI and an appropriate title to the browser data.
@@ -2960,7 +2960,7 @@ const BrowserSearch = {
    */
   updateSearchButton: function() {
     var searchButton = document.getAnonymousElementByAttribute(this.getSearchBar(),
-                                "anonid", "searchbar-dropmarker");
+                                "anonid", "search-go-button");
     if (!searchButton)
       return;
     var engines = gBrowser.mCurrentBrowser.engines;
diff --git a/browser/components/search/content/search.xml b/browser/components/search/content/search.xml
index 450c8d0bd00c..43f3a83f366e 100644
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -47,15 +47,12 @@
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       xmlns:xbl="http://www.mozilla.org/xbl">
 
-  <binding id="searchbar-base">
+  <binding id="searchbar">
     <resources>
       <stylesheet src="chrome://browser/content/search/searchbarBindings.css"/>
       <stylesheet src="chrome://browser/skin/searchbar.css"/>
     </resources>
-  </binding>
 
-  <binding id="searchbar"
-           extends="chrome://browser/content/search/search.xml#searchbar-base">
     <content>
       <xul:stringbundle src="chrome://browser/locale/search.properties"
                         anonid="searchbar-stringbundle"/>
@@ -83,11 +80,11 @@
 # engine icons line up, but that's prevented by inconsistent behavior of the 
 # popup position within a toolbarbutton.  See bug 336868.
               <xul:toolbarbutton class="search-go-button"
+                                 anonid="search-go-button"
                                  type="menu-button"
-                                 anonid="searchbar-dropmarker"
                                  xbl:inherits="src">
-                <xul:menupopup anonid="searchbar-popup"
-                               class="searchbar-popup"
+                <xul:menupopup class="searchbar-popup"
+                               anonid="searchbar-popup"
                                position="after_start">
                   <xul:menuseparator/>
                   <xul:menuitem anonid="open-engine-manager"
@@ -520,8 +517,8 @@
           <![CDATA[
             // Don't open search popup if history popup is open
             if (!this.popupOpen) {
-              document.getAnonymousElementByAttribute(this,
-                                         "anonid", "searchbar-popup").click();
+              document.getAnonymousElementByAttribute(this._getParentSearchbar(), 
+                                      "anonid", "search-go-button").open = true;
               return false;
             }
             return true;
@@ -668,13 +665,4 @@
 
     </handlers>
   </binding>
-
-  <binding id="searchbar-dropmarker"
-           extends="chrome://browser/content/search/search.xml#searchbar-base">
-    <content>
-      <xul:image class="searchbar-dropmarker-image"/>
-      <children/>
-    </content>
-  </binding>
-
 </bindings>
diff --git a/browser/components/search/content/searchbarBindings.css b/browser/components/search/content/searchbarBindings.css
index a896151f0e97..19c4682309fe 100644
--- a/browser/components/search/content/searchbarBindings.css
+++ b/browser/components/search/content/searchbarBindings.css
@@ -3,8 +3,3 @@
 .searchbar-textbox {
   -moz-binding: url("chrome://browser/content/search/search.xml#searchbar-textbox");
 }
-
-.searchbar-dropmarker {
-  -moz-binding: url("chrome://browser/content/search/search.xml#searchbar-dropmarker");
-  -moz-user-focus: none;
-}
diff --git a/browser/themes/pinstripe/browser/searchbar.css b/browser/themes/pinstripe/browser/searchbar.css
index 560b4e81b9f4..276d10a939c4 100644
--- a/browser/themes/pinstripe/browser/searchbar.css
+++ b/browser/themes/pinstripe/browser/searchbar.css
@@ -26,10 +26,6 @@
   list-style-image: url("chrome://browser/skin/Search-bar.png");
 }
 
-.searchbar-dropmarker-image {
-  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
-}
-
 .autocomplete-textbox-container {
   border: none;
   padding-right: 0px;
diff --git a/browser/themes/winstripe/browser/jar.mn b/browser/themes/winstripe/browser/jar.mn
index 9b157f2abb50..9d62b417ef0f 100644
--- a/browser/themes/winstripe/browser/jar.mn
+++ b/browser/themes/winstripe/browser/jar.mn
@@ -11,7 +11,6 @@ classic.jar:
         skin/classic/browser/livemark-item.png
         skin/classic/browser/livemark-item-rtl.png
         skin/classic/browser/searchbar.css
-        skin/classic/browser/search-arrow.gif
         skin/classic/browser/Search-bar.png
         skin/classic/browser/Search.png
         skin/classic/browser/Search-add-engines.png
diff --git a/browser/themes/winstripe/browser/search-arrow.gif b/browser/themes/winstripe/browser/search-arrow.gif
deleted file mode 100644
index 665a9e85d45344506f730310c08ed574e2de7ced..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 67
zcmZ?wbhEHb<YwSxn8?8J|Nnmm7^(P^g^_`Qi9rV_!T^$YU=o?quem^gpE<bXV5IPk
NIr8F(^IJq1tN~QS5q<yw

diff --git a/browser/themes/winstripe/browser/searchbar.css b/browser/themes/winstripe/browser/searchbar.css
index 0b48de7da1b1..8fcc8950d576 100644
--- a/browser/themes/winstripe/browser/searchbar.css
+++ b/browser/themes/winstripe/browser/searchbar.css
@@ -2,22 +2,11 @@
   width: 15em;
 }
 
-.searchbar-dropmarker {
-  margin-top: 2px;
-  margin-bottom: 1px;
-}
-
 .searchbar-engine-image {
   margin: 0px 0px 0px 2px;
   list-style-image: url("chrome://browser/skin/Search-bar.png");
 }
 
-.searchbar-dropmarker-image {
-  -moz-margin-start: 12px;
-  margin-top: 8px;
-  list-style-image: url("chrome://browser/skin/search-arrow.gif");
-}
-
 .search-go-button-container {
   border-left: 1px solid ThreeDShadow;
 }