Bug 614313 - Find arrows are not updated correctly [r=mfinkle]
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -1761,23 +1761,22 @@ var FindHelperUI = {
Browser.selectedBrowser.messageManager.sendAsyncMessage("FindAssist:Previous", { });
},
goToNext: function findHelperGoToNext() {
Browser.selectedBrowser.messageManager.sendAsyncMessage("FindAssist:Next", { });
},
search: function findHelperSearch(aValue) {
+ this.updateCommands(aValue);
+
// Don't bother searching if the value is empty
- if (aValue == "") {
- this.status = null;
+ if (aValue == "")
return;
- }
-
- this.updateCommands(aValue);
+
Browser.selectedBrowser.messageManager.sendAsyncMessage("FindAssist:Find", { searchString: aValue });
},
updateCommands: function findHelperUpdateCommands(aValue) {
let disabled = (this._status == Ci.nsITypeAheadFind.FIND_NOTFOUND) || (aValue == "");
this._cmdPrevious.setAttribute("disabled", disabled);
this._cmdNext.setAttribute("disabled", disabled);
},
--- a/mobile/chrome/tests/browser_find.js
+++ b/mobile/chrome/tests/browser_find.js
@@ -12,12 +12,15 @@ function test() {
getIdentityHandler().show();
ok(!menu.hidden, "Site menu is open");
ok(!navigator.isActive, "Toolbar is closed");
EventUtils.sendMouseEvent({ type: "click" }, item);
ok(menu.hidden, "Site menu is closed");
ok(navigator.isActive, "Toolbar is open");
+ is(navigator._previousButton.disabled, true, "Previous button should be disabled");
+ is(navigator._nextButton.disabled, true, "Previous button should be disabled");
+
EventUtils.synthesizeKey("VK_ESCAPE", {}, window);
ok(menu.hidden, "Site menu is closed");
ok(!navigator.isActive, "Toolbar is closed");
}