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
0b9d4e78
Commit
0b9d4e78
authored
12 years ago
by
Jacob Thornton
Browse files
Options
Download
Plain Diff
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
parents
7f3b94c4
d6ac499c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
docs/assets/js/bootstrap-dropdown.js
+4
-3
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap.js
+4
-3
docs/assets/js/bootstrap.js
js/bootstrap-dropdown.js
+4
-3
js/bootstrap-dropdown.js
js/tests/unit/bootstrap-dropdown.js
+41
-1
js/tests/unit/bootstrap-dropdown.js
with
53 additions
and
10 deletions
+53
-10
docs/assets/js/bootstrap-dropdown.js
+
4
-
3
View file @
0b9d4e78
...
...
@@ -99,9 +99,10 @@
}
function
clearMenus
()
{
getParent
(
$
(
toggle
))
.
removeClass
(
'
open
'
)
function
clearMenus
()
{
$
(
toggle
).
each
(
function
()
{
getParent
(
$
(
this
)).
removeClass
(
"
open
"
)
})
}
function
getParent
(
$this
)
{
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap.js
+
4
-
3
View file @
0b9d4e78
...
...
@@ -668,9 +668,10 @@
}
function
clearMenus
()
{
getParent
(
$
(
toggle
))
.
removeClass
(
'
open
'
)
function
clearMenus
()
{
$
(
toggle
).
each
(
function
()
{
getParent
(
$
(
this
)).
removeClass
(
"
open
"
)
})
}
function
getParent
(
$this
)
{
...
...
This diff is collapsed.
Click to expand it.
js/bootstrap-dropdown.js
+
4
-
3
View file @
0b9d4e78
...
...
@@ -99,9 +99,10 @@
}
function
clearMenus
()
{
getParent
(
$
(
toggle
))
.
removeClass
(
'
open
'
)
function
clearMenus
()
{
$
(
toggle
).
each
(
function
()
{
getParent
(
$
(
this
)).
removeClass
(
"
open
"
)
})
}
function
getParent
(
$this
)
{
...
...
This diff is collapsed.
Click to expand it.
js/tests/unit/bootstrap-dropdown.js
+
41
-
1
View file @
0b9d4e78
...
...
@@ -7,7 +7,8 @@ $(function () {
})
test
(
"
should return element
"
,
function
()
{
ok
(
$
(
document
.
body
).
dropdown
()[
0
]
==
document
.
body
,
'
document.body returned
'
)
var
el
=
$
(
"
<div />
"
)
ok
(
el
.
dropdown
()[
0
]
===
el
[
0
],
'
same element returned
'
)
})
test
(
"
should not open dropdown if target is disabled
"
,
function
()
{
...
...
@@ -102,4 +103,43 @@ $(function () {
dropdown
.
remove
()
})
test
(
"
should remove open class if body clicked, with multiple drop downs
"
,
function
()
{
var
dropdownHTML
=
'
<ul class="nav">
'
+
'
<li><a href="#menu1">Menu 1</a></li>
'
+
'
<li class="dropdown" id="testmenu">
'
+
'
<a class="dropdown-toggle" data-toggle="dropdown" href="#testmenu">Test menu <b class="caret"></b></a>
'
+
'
<ul class="dropdown-menu" role="menu">
'
+
'
<li><a href="#sub1">Submenu 1</a></li>
'
+
'
</ul>
'
+
'
</li>
'
+
'
</ul>
'
+
'
<div class="btn-group">
'
+
'
<button class="btn">Actions</button>
'
+
'
<button class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
'
+
'
<ul class="dropdown-menu">
'
+
'
<li><a href="#">Action 1</a></li>
'
+
'
</ul>
'
+
'
</div>
'
,
dropdowns
=
$
(
dropdownHTML
).
appendTo
(
'
#qunit-fixture
'
).
find
(
'
[data-toggle="dropdown"]
'
)
,
first
=
dropdowns
.
first
()
,
last
=
dropdowns
.
last
()
ok
(
dropdowns
.
length
==
2
,
"
Should be two dropdowns
"
)
first
.
click
()
ok
(
first
.
parents
(
'
.open
'
).
length
==
1
,
'
open class added on click
'
)
ok
(
$
(
'
#qunit-fixture .open
'
).
length
==
1
,
'
only one object is open
'
)
$
(
'
body
'
).
click
()
ok
(
$
(
"
#qunit-fixture .open
"
).
length
===
0
,
'
open class removed
'
)
last
.
click
()
ok
(
last
.
parent
(
'
.open
'
).
length
==
1
,
'
open class added on click
'
)
ok
(
$
(
'
#qunit-fixture .open
'
).
length
==
1
,
'
only one object is open
'
)
$
(
'
body
'
).
click
()
ok
(
$
(
"
#qunit-fixture .open
"
).
length
===
0
,
'
open class removed
'
)
$
(
"
#qunit-fixture
"
).
html
(
""
)
})
})
\ 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