mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
Merge remote-tracking branch 'origin/2.1.0-wip' into 2.1.1-wip
This commit is contained in:
commit
b5373d8561
2
js/bootstrap-typeahead.js
vendored
2
js/bootstrap-typeahead.js
vendored
@ -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))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user