aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-09-04 20:13:36 -0700
committerMark Otto <[email protected]>2012-09-04 20:13:36 -0700
commitdf8e3c6ee3716a3fad45bff08fafc29c55967515 (patch)
tree77acc4d280ac604b35446c1610e04b338357cf78 /js
parentbc4ecd998496d49ae6a7a687a2bdf1af6bcb740b (diff)
parent9341bb756b639ce4e44cb6297b7e15be297d511b (diff)
downloadbootstrap-df8e3c6ee3716a3fad45bff08fafc29c55967515.tar.xz
bootstrap-df8e3c6ee3716a3fad45bff08fafc29c55967515.zip
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
Diffstat (limited to 'js')
-rw-r--r--js/bootstrap-typeahead.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index 6ceacd61d..c2ccdea21 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))
}