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
df8e3c6e
Commit
df8e3c6e
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
parents
bc4ecd99
9341bb75
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+7
-0
Makefile
js/bootstrap-typeahead.js
+1
-1
js/bootstrap-typeahead.js
with
8 additions
and
1 deletion
+8
-1
Makefile
+
7
-
0
View file @
df8e3c6e
...
...
@@ -50,6 +50,13 @@ test:
kill
-9
`
cat
js/tests/pid.txt
`
rm
js/tests/pid.txt
#
# CLEANS THE ROOT DIRECTORY OF PRIOR BUILDS
#
clean
:
rm
-r
bootstrap
#
# BUILD SIMPLE BOOTSTRAP DIRECTORY
# recess & uglifyjs are required
...
...
This diff is collapsed.
Click to expand it.
js/bootstrap-typeahead.js
+
1
-
1
View file @
df8e3c6e
...
...
@@ -174,7 +174,7 @@
.
on
(
'
keypress
'
,
$
.
proxy
(
this
.
keypress
,
this
))
.
on
(
'
keyup
'
,
$
.
proxy
(
this
.
keyup
,
this
))
if
(
$
.
browser
.
webkit
||
$
.
browser
.
msie
)
{
if
(
$
.
browser
.
chrome
||
$
.
browser
.
webkit
||
$
.
browser
.
msie
)
{
this
.
$element
.
on
(
'
keydown
'
,
$
.
proxy
(
this
.
keydown
,
this
))
}
...
...
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