diff options
| author | Ross Johnson <ross@mazira.com> | 2012-08-28 20:14:34 +0400 |
|---|---|---|
| committer | Ross Johnson <ross@mazira.com> | 2012-08-28 20:14:34 +0400 |
| commit | b5373d85616653ff265295d5d22c03fc9ac8af04 (patch) | |
| tree | ebe5ec31c58d560aced5bd782e8eb4081ea57590 | |
| parent | 545edf5459d0bdc25b65ba7ee9983cb6562c2842 (diff) | |
| parent | 66ad3d62c668710b4a2c98f0f3b91a4d5a5bb55c (diff) | |
Merge remote-tracking branch 'origin/2.1.0-wip' into 2.1.1-wip
| -rw-r--r-- | js/bootstrap-typeahead.js | 2 |
1 files changed, 1 insertions, 1 deletions
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)) } |