Bug 580293 - Next/Previous buttons are enabled when search field is empty [r=mfinkle]

mobile/chrome/content/browser-ui.js

@@ -1445,6 +1445,9 @@ var FindHelperUI = {
     this._textbox = document.getElementById("find-helper-textbox");
     this._container = document.getElementById("content-navigator");
 
+    this._cmdPrevious = document.getElementById(this.commands.previous);
+    this._cmdNext = document.getElementById(this.commands.next);
+
     // Listen for form assistant messages from content
     messageManager.addMessageListener("FindAssist:Show", this);
 
@@ -1470,8 +1473,8 @@ var FindHelperUI = {
 
   show: function findHelperShow() {
     Browser._browserView.ignorePageScroll(true);
-    Browser.selectedBrowser.messageManager.sendAsyncMessage("FindAssist:Find", { searchString: "" });
     this._container.show(this);
+    this.search("");
     this._textbox.focus();
   },
 
@@ -1490,9 +1493,15 @@ var FindHelperUI = {
   },
 
   search: function findHelperSearch(aValue) {
+    this.updateCommands(aValue);
     Browser.selectedBrowser.messageManager.sendAsyncMessage("FindAssist:Find", { searchString: aValue });
   },
 
+  updateCommands: function findHelperUpdateCommands(aValue) {
+    this._cmdPrevious.setAttribute("disabled", aValue == "");
+    this._cmdNext.setAttribute("disabled", aValue == "");
+  },
+
   updateFindInPage: function findHelperUpdateFindInPage() {
     PageActions.removeItems("findinpage");
     let title = Elements.browserBundle.getString("pageactions.findInPage");

mobile/chrome/content/browser.xul

@@ -277,7 +277,7 @@
         <vbox id="content-navigator" class="window-width" top="0" spacer="content-navigator-spacer">
           <arrowscrollbox id="form-helper-autofill" collapsed="true" align="center" flex="1" orient="horizontal"
                           onclick="FormHelperUI.doAutoComplete(event.target);"/>
-          <textbox id="find-helper-textbox"  oncommand="FindHelperUI.search(this.value)" type="search" flex="1"/>
+          <textbox id="find-helper-textbox" oncommand="FindHelperUI.search(this.value)" oninput="FindHelperUI.updateCommands(this.value);" type="search" flex="1"/>
         </vbox>
       </stack>