Merge remote-tracking branch 'origin/2.1.0-wip' into 2.1.1-wip

vol4ok · Aug 28, 2012 · b5373d8 · b5373d8
2 parents 545edf5 + 66ad3d6
commit b5373d8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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))
       }