mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-16 10:34:07 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
This commit is contained in:
Jacob Thornton
2012-01-27 11:07:17 -08:00
parent aa594501bd 97546adc90
commit 3b3dbd7229
9 changed files with 58 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/bootstrap-typeahead.js vendored
View File

@@ -157,6 +157,7 @@
case 9: // tab
case 13: // enter
if (!this.shown) return
this.select()
break
@@ -172,6 +173,7 @@
, keypress: function (e) {
e.stopPropagation()
if (!this.shown) return
switch(e.keyCode) {
case 9: // tab
@@ -181,13 +183,11 @@
break
case 38: // up arrow
if (!this.shown) return
e.preventDefault()
this.prev()
break
case 40: // down arrow
if (!this.shown) return
e.preventDefault()
this.next()
break