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
d65f7f20
Commit
d65f7f20
authored
12 years ago
by
Jacob Thornton
Browse files
Options
Download
Email Patches
Plain Diff
don't open dropdown if target is disabled
parent
82267d48
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
js/bootstrap-dropdown.js
+5
-1
js/bootstrap-dropdown.js
js/tests/unit/bootstrap-dropdown.js
+34
-0
js/tests/unit/bootstrap-dropdown.js
with
39 additions
and
1 deletion
+39
-1
js/bootstrap-dropdown.js
+
5
-
1
View file @
d65f7f20
...
@@ -40,10 +40,14 @@
...
@@ -40,10 +40,14 @@
,
toggle
:
function
(
e
)
{
,
toggle
:
function
(
e
)
{
var
$this
=
$
(
this
)
var
$this
=
$
(
this
)
,
selector
=
$this
.
attr
(
'
data-target
'
)
,
selector
,
$parent
,
$parent
,
isActive
,
isActive
if
(
$this
.
is
(
'
.disabled, :disabled
'
))
return
selector
=
$this
.
attr
(
'
data-target
'
)
if
(
!
selector
)
{
if
(
!
selector
)
{
selector
=
$this
.
attr
(
'
href
'
)
selector
=
$this
.
attr
(
'
href
'
)
selector
=
selector
&&
selector
.
replace
(
/.*
(?=
#
[^\s]
*$
)
/
,
''
)
//strip for ie7
selector
=
selector
&&
selector
.
replace
(
/.*
(?=
#
[^\s]
*$
)
/
,
''
)
//strip for ie7
...
...
This diff is collapsed.
Click to expand it.
js/tests/unit/bootstrap-dropdown.js
+
34
-
0
View file @
d65f7f20
...
@@ -10,6 +10,40 @@ $(function () {
...
@@ -10,6 +10,40 @@ $(function () {
ok
(
$
(
document
.
body
).
dropdown
()[
0
]
==
document
.
body
,
'
document.body returned
'
)
ok
(
$
(
document
.
body
).
dropdown
()[
0
]
==
document
.
body
,
'
document.body returned
'
)
})
})
test
(
"
should not open dropdown if target is disabled
"
,
function
()
{
var
dropdownHTML
=
'
<ul class="tabs">
'
+
'
<li class="dropdown">
'
+
'
<button disabled href="#" class="btn dropdown-toggle" data-toggle="dropdown">Dropdown</button>
'
+
'
<ul class="dropdown-menu">
'
+
'
<li><a href="#">Secondary link</a></li>
'
+
'
<li><a href="#">Something else here</a></li>
'
+
'
<li class="divider"></li>
'
+
'
<li><a href="#">Another link</a></li>
'
+
'
</ul>
'
+
'
</li>
'
+
'
</ul>
'
,
dropdown
=
$
(
dropdownHTML
).
find
(
'
[data-toggle="dropdown"]
'
).
dropdown
().
click
()
ok
(
!
dropdown
.
parent
(
'
.dropdown
'
).
hasClass
(
'
open
'
),
'
open class added on click
'
)
})
test
(
"
should not open dropdown if target is disabled
"
,
function
()
{
var
dropdownHTML
=
'
<ul class="tabs">
'
+
'
<li class="dropdown">
'
+
'
<button href="#" class="btn dropdown-toggle disabled" data-toggle="dropdown">Dropdown</button>
'
+
'
<ul class="dropdown-menu">
'
+
'
<li><a href="#">Secondary link</a></li>
'
+
'
<li><a href="#">Something else here</a></li>
'
+
'
<li class="divider"></li>
'
+
'
<li><a href="#">Another link</a></li>
'
+
'
</ul>
'
+
'
</li>
'
+
'
</ul>
'
,
dropdown
=
$
(
dropdownHTML
).
find
(
'
[data-toggle="dropdown"]
'
).
dropdown
().
click
()
ok
(
!
dropdown
.
parent
(
'
.dropdown
'
).
hasClass
(
'
open
'
),
'
open class added on click
'
)
})
test
(
"
should add class open to menu if clicked
"
,
function
()
{
test
(
"
should add class open to menu if clicked
"
,
function
()
{
var
dropdownHTML
=
'
<ul class="tabs">
'
var
dropdownHTML
=
'
<ul class="tabs">
'
+
'
<li class="dropdown">
'
+
'
<li class="dropdown">
'
...
...
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