mirror of
https://github.com/Hopiu/bootstrap.git
synced 2026-04-06 14:20:58 +00:00
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
This commit is contained in:
commit
3823d29c04
4 changed files with 4 additions and 4 deletions
2
docs/assets/js/bootstrap-typeahead.js
vendored
2
docs/assets/js/bootstrap-typeahead.js
vendored
|
|
@ -208,7 +208,7 @@
|
|||
}
|
||||
|
||||
, keydown: function (e) {
|
||||
this.suppressKeyPressRepeat = !~[40,38,9,13,27].indexOf(e.keyCode)
|
||||
this.suppressKeyPressRepeat = !~$.inArray(e.keyCode, [40,38,9,13,27])
|
||||
this.move(e)
|
||||
}
|
||||
|
||||
|
|
|
|||
2
docs/assets/js/bootstrap.js
vendored
2
docs/assets/js/bootstrap.js
vendored
|
|
@ -1828,7 +1828,7 @@
|
|||
}
|
||||
|
||||
, keydown: function (e) {
|
||||
this.suppressKeyPressRepeat = !~[40,38,9,13,27].indexOf(e.keyCode)
|
||||
this.suppressKeyPressRepeat = !~$.inArray(e.keyCode, [40,38,9,13,27])
|
||||
this.move(e)
|
||||
}
|
||||
|
||||
|
|
|
|||
2
docs/assets/js/bootstrap.min.js
vendored
2
docs/assets/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
2
js/bootstrap-typeahead.js
vendored
2
js/bootstrap-typeahead.js
vendored
|
|
@ -208,7 +208,7 @@
|
|||
}
|
||||
|
||||
, keydown: function (e) {
|
||||
this.suppressKeyPressRepeat = !~[40,38,9,13,27].indexOf(e.keyCode)
|
||||
this.suppressKeyPressRepeat = !~$.inArray(e.keyCode, [40,38,9,13,27])
|
||||
this.move(e)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue