Commit 10e72e15 authored by fat's avatar fat

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

parents 91fbadad c362e726
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
} }
, keydown: function (e) { , keydown: function (e) {
this.suppressKeyPressRepeat = !~$.inArray(e.keyCode, [40,38,9,13,27]) this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])
this.move(e) this.move(e)
} }
......
...@@ -143,10 +143,19 @@ $(function () { ...@@ -143,10 +143,19 @@ $(function () {
equals(typeahead.$menu.find('.active').length, 1, 'one item is active') equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active") ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active")
// simulate entire key pressing event
$input.trigger({ $input.trigger({
type: 'keydown' type: 'keydown'
, keyCode: 40 , keyCode: 40
}) })
.trigger({
type: 'keypress'
, keyCode: 40
})
.trigger({
type: 'keyup'
, keyCode: 40
})
ok(typeahead.$menu.find('li').first().next().hasClass('active'), "second item is active") ok(typeahead.$menu.find('li').first().next().hasClass('active'), "second item is active")
...@@ -155,6 +164,14 @@ $(function () { ...@@ -155,6 +164,14 @@ $(function () {
type: 'keydown' type: 'keydown'
, keyCode: 38 , keyCode: 38
}) })
.trigger({
type: 'keypress'
, keyCode: 38
})
.trigger({
type: 'keyup'
, keyCode: 38
})
ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active") ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active")
...@@ -202,4 +219,4 @@ $(function () { ...@@ -202,4 +219,4 @@ $(function () {
typeahead.$menu.remove() typeahead.$menu.remove()
}) })
}) })
\ No newline at end of file
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