diff options
| author | Mark Otto <markotto@twitter.com> | 2012-09-05 07:13:36 +0400 |
|---|---|---|
| committer | Mark Otto <markotto@twitter.com> | 2012-09-05 07:13:36 +0400 |
| commit | df8e3c6ee3716a3fad45bff08fafc29c55967515 (patch) | |
| tree | 77acc4d280ac604b35446c1610e04b338357cf78 | |
| parent | bc4ecd998496d49ae6a7a687a2bdf1af6bcb740b (diff) | |
| parent | 9341bb756b639ce4e44cb6297b7e15be297d511b (diff) | |
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | js/bootstrap-typeahead.js | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -51,6 +51,13 @@ test: rm js/tests/pid.txt # +# CLEANS THE ROOT DIRECTORY OF PRIOR BUILDS +# + +clean: + rm -r bootstrap + +# # BUILD SIMPLE BOOTSTRAP DIRECTORY # recess & uglifyjs are required # diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index 6ceacd61dc..c2ccdea218 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -174,7 +174,7 @@ .on('keypress', $.proxy(this.keypress, this)) .on('keyup', $.proxy(this.keyup, this)) - if ($.browser.webkit || $.browser.msie) { + if ($.browser.chrome || $.browser.webkit || $.browser.msie) { this.$element.on('keydown', $.proxy(this.keydown, this)) } |