Skip to content

B
bootstrap
Commit 48063afb authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

Conflicts:
	docs/assets/bootstrap.zip
parents 0b2d23d4 08fee005
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
docs/assets/js/bootstrap-typeahead.js
View file @ 48063afb
...@@ -204,11 +204,13 @@ ...@@ -204,11 +204,13 @@
break break
case 38: // up arrow case 38: // up arrow
if (e.type != 'keydown') break
e.preventDefault() e.preventDefault()
this.prev() this.prev()
break break
case 40: // down arrow case 40: // down arrow
if (e.type != 'keydown') break
e.preventDefault() e.preventDefault()
this.next() this.next()
break break
......
js/bootstrap-typeahead.js
View file @ 48063afb
...@@ -204,11 +204,13 @@ ...@@ -204,11 +204,13 @@
break break
case 38: // up arrow case 38: // up arrow
if (e.type != 'keydown') break
e.preventDefault() e.preventDefault()
this.prev() this.prev()
break break
case 40: // down arrow case 40: // down arrow
if (e.type != 'keydown') break
e.preventDefault() e.preventDefault()
this.next() this.next()
break break
......
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