Merge pull request #31308 from wilsonpage/1191671

Bug 1191671 - clearing previous search in rocketbar should not dismiss keyboard
mozilla-b2g · Aug 19, 2015 · fa32b80 · fa32b80
2 parents 8f77edf + fd6e170
commit fa32b80
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/apps/system/js/rocketbar.js b/apps/system/js/rocketbar.js
@@ -311,6 +311,7 @@
             this.handleCancel(e);
           } else if (e.target == this.clearBtn) {
             this.clear();
+            this.focus();
           } else if (e.target == this.backdrop) {
             this._closeSearch();
           }

diff --git a/apps/system/test/unit/rocketbar_test.js b/apps/system/test/unit/rocketbar_test.js
@@ -396,10 +396,12 @@ suite('system/Rocketbar', function() {
   test('handleEvent() - click clear button', function() {
     var setInputStub = this.sinon.stub(subject, 'setInput');
     var hideResultsStub = this.sinon.stub(subject, 'hideResults');
+    var focusStub = this.sinon.stub(subject, 'focus');
     var event = {type: 'click', target: subject.clearBtn};
     subject.handleEvent(event);
     assert.ok(setInputStub.calledWith(''));
     assert.ok(hideResultsStub.calledOnce);
+    assert.ok(focusStub.calledOnce);
   });
 
   test('handleEvent() - click backdrop', function() {