mirror of
https://github.com/Hopiu/bootstrap.git
synced 2026-03-25 00:40:24 +00:00
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts: docs/assets/bootstrap.zip
This commit is contained in:
commit
48063afb3a
3 changed files with 4 additions and 0 deletions
Binary file not shown.
2
docs/assets/js/bootstrap-typeahead.js
vendored
2
docs/assets/js/bootstrap-typeahead.js
vendored
|
|
@ -204,11 +204,13 @@
|
|||
break
|
||||
|
||||
case 38: // up arrow
|
||||
if (e.type != 'keydown') break
|
||||
e.preventDefault()
|
||||
this.prev()
|
||||
break
|
||||
|
||||
case 40: // down arrow
|
||||
if (e.type != 'keydown') break
|
||||
e.preventDefault()
|
||||
this.next()
|
||||
break
|
||||
|
|
|
|||
2
js/bootstrap-typeahead.js
vendored
2
js/bootstrap-typeahead.js
vendored
|
|
@ -204,11 +204,13 @@
|
|||
break
|
||||
|
||||
case 38: // up arrow
|
||||
if (e.type != 'keydown') break
|
||||
e.preventDefault()
|
||||
this.prev()
|
||||
break
|
||||
|
||||
case 40: // down arrow
|
||||
if (e.type != 'keydown') break
|
||||
e.preventDefault()
|
||||
this.next()
|
||||
break
|
||||
|
|
|
|||
Loading…
Reference in a new issue