Skip to content
GitLab
Explore
Projects
Groups
Snippets
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
667179f4
Commit
667179f4
authored
12 years ago
by
Jacob Thornton
Browse files
Options
Download
Email Patches
Plain Diff
added support for jquery 1.8.*
parent
c92a7599
5 merge requests
!5565
Boostraptest
,
!5450
Fixed copy and paste caused typo in CAROUSEL DATA-API
,
!5326
Replace watchr with node-supervisor
,
!5277
Please delete
,
!5042
Pagination Javascript Component
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
docs/assets/js/jquery.js
+2
-4
docs/assets/js/jquery.js
js/bootstrap-typeahead.js
+10
-1
js/bootstrap-typeahead.js
js/tests/unit/bootstrap-popover.js
+4
-4
js/tests/unit/bootstrap-popover.js
js/tests/unit/bootstrap-tooltip.js
+7
-7
js/tests/unit/bootstrap-tooltip.js
js/tests/unit/bootstrap-typeahead.js
+6
-11
js/tests/unit/bootstrap-typeahead.js
js/tests/vendor/jquery.js
+2
-4
js/tests/vendor/jquery.js
with
31 additions
and
31 deletions
+31
-31
docs/assets/js/jquery.js
+
2
-
4
View file @
667179f4
This diff is collapsed.
Click to expand it.
js/bootstrap-typeahead.js
+
10
-
1
View file @
667179f4
...
...
@@ -174,7 +174,7 @@
.
on
(
'
keypress
'
,
$
.
proxy
(
this
.
keypress
,
this
))
.
on
(
'
keyup
'
,
$
.
proxy
(
this
.
keyup
,
this
))
if
(
$
.
browser
.
chrome
||
$
.
browser
.
webkit
||
$
.
browser
.
msie
)
{
if
(
this
.
eventSupported
(
'
keydown
'
)
)
{
this
.
$element
.
on
(
'
keydown
'
,
$
.
proxy
(
this
.
keydown
,
this
))
}
...
...
@@ -183,6 +183,15 @@
.
on
(
'
mouseenter
'
,
'
li
'
,
$
.
proxy
(
this
.
mouseenter
,
this
))
}
,
eventSupported
:
function
(
eventName
)
{
var
isSupported
=
eventName
in
this
.
$element
if
(
!
isSupported
)
{
this
.
$element
.
setAttribute
(
eventName
,
'
return;
'
)
isSupported
=
typeof
this
.
$element
[
eventName
]
===
'
function
'
}
return
isSupported
}
,
move
:
function
(
e
)
{
if
(
!
this
.
shown
)
return
...
...
This diff is collapsed.
Click to expand it.
js/tests/unit/bootstrap-popover.js
+
4
-
4
View file @
667179f4
...
...
@@ -94,14 +94,14 @@ $(function () {
test
(
"
should destroy popover
"
,
function
()
{
var
popover
=
$
(
'
<div/>
'
).
popover
({
trigger
:
'
hover
'
}).
on
(
'
click.foo
'
,
function
(){})
ok
(
popover
.
data
(
'
popover
'
),
'
popover has data
'
)
ok
(
popover
.
data
(
'
events
'
).
mouseover
&&
popover
.
data
(
'
events
'
).
mouseout
,
'
popover has hover event
'
)
ok
(
popover
.
data
(
'
events
'
).
click
[
0
].
namespace
==
'
foo
'
,
'
popover has extra click.foo event
'
)
ok
(
$
.
_data
(
popover
[
0
],
'
events
'
).
mouseover
&&
$
.
_data
(
popover
[
0
],
'
events
'
).
mouseout
,
'
popover has hover event
'
)
ok
(
$
.
_data
((
popover
[
0
],
'
events
'
).
click
[
0
].
namespace
==
'
foo
'
,
'
popover has extra click.foo event
'
)
popover
.
popover
(
'
show
'
)
popover
.
popover
(
'
destroy
'
)
ok
(
!
popover
.
hasClass
(
'
in
'
),
'
popover is hidden
'
)
ok
(
!
popover
.
data
(
'
popover
'
),
'
popover does not have data
'
)
ok
(
popover
.
data
(
'
events
'
).
click
[
0
].
namespace
==
'
foo
'
,
'
popover still has click.foo
'
)
ok
(
!
popover
.
data
(
'
events
'
).
mouseover
&&
!
popover
.
data
(
'
events
'
).
mouseout
,
'
popover does not have any events
'
)
ok
(
$
.
_data
(
popover
[
0
],
'
events
'
).
click
[
0
].
namespace
==
'
foo
'
,
'
popover still has click.foo
'
)
ok
(
!
$
.
_data
(
popover
[
0
],
'
events
'
).
mouseover
&&
!
$
.
_data
(
popover
[
0
],
'
events
'
).
mouseout
,
'
popover does not have any events
'
)
})
})
\ No newline at end of file
This diff is collapsed.
Click to expand it.
js/tests/unit/bootstrap-tooltip.js
+
7
-
7
View file @
667179f4
...
...
@@ -113,7 +113,7 @@ $(function () {
},
50
)
})
test
(
"
should show tooltip if leave event hasn't occur
r
ed before delay expires
"
,
function
()
{
test
(
"
should show tooltip if leave event hasn't occured before delay expires
"
,
function
()
{
var
tooltip
=
$
(
'
<a href="#" rel="tooltip" title="Another tooltip"></a>
'
)
.
appendTo
(
'
#qunit-fixture
'
)
.
tooltip
({
delay
:
150
})
...
...
@@ -131,14 +131,14 @@ $(function () {
test
(
"
should destroy tooltip
"
,
function
()
{
var
tooltip
=
$
(
'
<div/>
'
).
tooltip
().
on
(
'
click.foo
'
,
function
(){})
ok
(
tooltip
.
data
(
'
tooltip
'
),
'
tooltip has data
'
)
ok
(
tooltip
.
data
(
'
events
'
).
mouseover
&&
tooltip
.
data
(
'
events
'
).
mouseout
,
'
tooltip has hover event
'
)
ok
(
tooltip
.
data
(
'
events
'
).
click
[
0
].
namespace
==
'
foo
'
,
'
tooltip has extra click.foo event
'
)
ok
(
$
.
_data
(
tooltip
[
0
],
'
events
'
).
mouseover
&&
$
.
_data
(
tooltip
[
0
],
'
events
'
).
mouseout
,
'
tooltip has hover event
'
)
ok
(
$
.
_data
(
tooltip
[
0
],
'
events
'
).
click
[
0
].
namespace
==
'
foo
'
,
'
tooltip has extra click.foo event
'
)
tooltip
.
tooltip
(
'
show
'
)
tooltip
.
tooltip
(
'
destroy
'
)
ok
(
!
tooltip
.
hasClass
(
'
in
'
),
'
tooltip is hidden
'
)
ok
(
!
tooltip
.
data
(
'
tooltip
'
),
'
tooltip does not have data
'
)
ok
(
tooltip
.
data
(
'
events
'
).
click
[
0
].
namespace
==
'
foo
'
,
'
tooltip still has click.foo
'
)
ok
(
!
tooltip
.
data
(
'
events
'
).
mouseover
&&
!
tooltip
.
data
(
'
events
'
).
mouseout
,
'
tooltip does not have any events
'
)
ok
(
!
$
.
_data
(
tooltip
[
0
],
'
tooltip
'
),
'
tooltip does not have data
'
)
ok
(
$
.
_data
(
tooltip
[
0
],
'
events
'
).
click
[
0
].
namespace
==
'
foo
'
,
'
tooltip still has click.foo
'
)
ok
(
!
$
.
_data
(
tooltip
[
0
],
'
events
'
).
mouseover
&&
!
$
.
_data
(
tooltip
[
0
],
'
events
'
).
mouseout
,
'
tooltip does not have any events
'
)
})
})
})
\ No newline at end of file
This diff is collapsed.
Click to expand it.
js/tests/unit/bootstrap-typeahead.js
+
6
-
11
View file @
667179f4
...
...
@@ -13,14 +13,9 @@ $(function () {
test
(
"
should listen to an input
"
,
function
()
{
var
$input
=
$
(
'
<input />
'
)
$input
.
typeahead
()
ok
(
$input
.
data
(
'
events
'
).
blur
,
'
has a blur event
'
)
ok
(
$input
.
data
(
'
events
'
).
keypress
,
'
has a keypress event
'
)
ok
(
$input
.
data
(
'
events
'
).
keyup
,
'
has a keyup event
'
)
if
(
$
.
browser
.
webkit
||
$
.
browser
.
msie
)
{
ok
(
$input
.
data
(
'
events
'
).
keydown
,
'
has a keydown event
'
)
}
else
{
ok
(
$input
.
data
(
'
events
'
).
keydown
,
'
does not have a keydown event
'
)
}
ok
(
$
.
_data
(
$input
[
0
],
'
events
'
).
blur
,
'
has a blur event
'
)
ok
(
$
.
_data
(
$input
[
0
],
'
events
'
).
keypress
,
'
has a keypress event
'
)
ok
(
$
.
_data
(
$input
[
0
],
'
events
'
).
keyup
,
'
has a keyup event
'
)
})
test
(
"
should create a menu
"
,
function
()
{
...
...
@@ -32,8 +27,8 @@ $(function () {
var
$input
=
$
(
'
<input />
'
)
,
$menu
=
$input
.
typeahead
().
data
(
'
typeahead
'
).
$menu
ok
(
$
menu
.
data
(
'
events
'
).
mouseover
,
'
has a mouseover(pseudo: mouseenter)
'
)
ok
(
$
menu
.
data
(
'
events
'
).
click
,
'
has a click
'
)
ok
(
$
.
_data
(
$menu
[
0
],
'
events
'
).
mouseover
,
'
has a mouseover(pseudo: mouseenter)
'
)
ok
(
$
.
_data
(
$menu
[
0
],
'
events
'
).
click
,
'
has a click
'
)
})
test
(
"
should show menu when query entered
"
,
function
()
{
...
...
@@ -201,4 +196,4 @@ $(function () {
typeahead
.
$menu
.
remove
()
})
})
})
\ No newline at end of file
This diff is collapsed.
Click to expand it.
js/tests/vendor/jquery.js
+
2
-
4
View file @
667179f4
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
Menu
Explore
Projects
Groups
Snippets