Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
10e72e15
Commit
10e72e15
authored
12 years ago
by
fat
Browse files
Options
Download
Plain Diff
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
parents
91fbadad
c362e726
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
js/bootstrap-typeahead.js
+1
-1
js/bootstrap-typeahead.js
js/tests/unit/bootstrap-typeahead.js
+18
-1
js/tests/unit/bootstrap-typeahead.js
with
19 additions
and
2 deletions
+19
-2
js/bootstrap-typeahead.js
+
1
-
1
View file @
10e72e15
...
...
@@ -217,7 +217,7 @@
}
,
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 diff is collapsed.
Click to expand it.
js/tests/unit/bootstrap-typeahead.js
+
18
-
1
View file @
10e72e15
...
...
@@ -143,10 +143,19 @@ $(function () {
equals
(
typeahead
.
$menu
.
find
(
'
.active
'
).
length
,
1
,
'
one item is active
'
)
ok
(
typeahead
.
$menu
.
find
(
'
li
'
).
first
().
hasClass
(
'
active
'
),
"
first item is active
"
)
// simulate entire key pressing event
$input
.
trigger
({
type
:
'
keydown
'
,
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
"
)
...
...
@@ -155,6 +164,14 @@ $(function () {
type
:
'
keydown
'
,
keyCode
:
38
})
.
trigger
({
type
:
'
keypress
'
,
keyCode
:
38
})
.
trigger
({
type
:
'
keyup
'
,
keyCode
:
38
})
ok
(
typeahead
.
$menu
.
find
(
'
li
'
).
first
().
hasClass
(
'
active
'
),
"
first item is active
"
)
...
...
@@ -202,4 +219,4 @@ $(function () {
typeahead
.
$menu
.
remove
()
})
})
\ No newline at end of file
})
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment