diff options
| author | Jacob Thornton <[email protected]> | 2012-01-27 11:07:17 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-27 11:07:17 -0800 |
| commit | 3b3dbd7229f53eb71759def4eca90dfd7a2699f8 (patch) | |
| tree | 89a8af1724ef8791a315a028c5515a5ec8500d3b /js/bootstrap-typeahead.js | |
| parent | aa594501bd24d51181dc3504602aa4aaefb1cb60 (diff) | |
| parent | 97546adc90a9c8149bb4560641b4164338e38063 (diff) | |
| download | bootstrap-3b3dbd7229f53eb71759def4eca90dfd7a2699f8.tar.xz bootstrap-3b3dbd7229f53eb71759def4eca90dfd7a2699f8.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/css/bootstrap.css
Diffstat (limited to 'js/bootstrap-typeahead.js')
| -rw-r--r-- | js/bootstrap-typeahead.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index 82c318831..b4d839c93 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -157,6 +157,7 @@ case 9: // tab case 13: // enter + if (!this.shown) return this.select() break @@ -172,6 +173,7 @@ , keypress: function (e) { e.stopPropagation() + if (!this.shown) return switch(e.keyCode) { case 9: // tab @@ -181,13 +183,11 @@ break case 38: // up arrow - if (!this.shown) return e.preventDefault() this.prev() break case 40: // down arrow - if (!this.shown) return e.preventDefault() this.next() break |