Skip to content

B
bootstrap
Commit b5373d85 authored by Ross Johnson's avatar Ross Johnson
Browse files
Options

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

parents 545edf54 66ad3d62
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
js/bootstrap-typeahead.js
View file @ b5373d85
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
.on('keypress', $.proxy(this.keypress, this)) .on('keypress', $.proxy(this.keypress, this))
.on('keyup', $.proxy(this.keyup, 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)) this.$element.on('keydown', $.proxy(this.keydown, this))
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment