Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
601e2520
Commit
601e2520
authored
Aug 27, 2012
by
Jacob Thornton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix for #4761
parent
d797a5fb
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
5 deletions
+24
-5
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-button.js
+1
-1
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.js
+1
-1
docs/assets/js/bootstrap.min.js
docs/assets/js/bootstrap.min.js
+1
-1
js/bootstrap-button.js
js/bootstrap-button.js
+1
-1
js/tests/unit/bootstrap-button.js
js/tests/unit/bootstrap-button.js
+20
-1
No files found.
docs/assets/js/bootstrap-button.js
View file @
601e2520
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
}
}
Button
.
prototype
.
toggle
=
function
()
{
Button
.
prototype
.
toggle
=
function
()
{
var
$parent
=
this
.
$element
.
paren
t
(
'
[data-toggle="buttons-radio"]
'
)
var
$parent
=
this
.
$element
.
closes
t
(
'
[data-toggle="buttons-radio"]
'
)
$parent
&&
$parent
$parent
&&
$parent
.
find
(
'
.active
'
)
.
find
(
'
.active
'
)
...
...
docs/assets/js/bootstrap.js
View file @
601e2520
...
@@ -199,7 +199,7 @@
...
@@ -199,7 +199,7 @@
}
}
Button
.
prototype
.
toggle
=
function
()
{
Button
.
prototype
.
toggle
=
function
()
{
var
$parent
=
this
.
$element
.
paren
t
(
'
[data-toggle="buttons-radio"]
'
)
var
$parent
=
this
.
$element
.
closes
t
(
'
[data-toggle="buttons-radio"]
'
)
$parent
&&
$parent
$parent
&&
$parent
.
find
(
'
.active
'
)
.
find
(
'
.active
'
)
...
...
docs/assets/js/bootstrap.min.js
View file @
601e2520
This diff is collapsed.
Click to expand it.
js/bootstrap-button.js
View file @
601e2520
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
}
}
Button
.
prototype
.
toggle
=
function
()
{
Button
.
prototype
.
toggle
=
function
()
{
var
$parent
=
this
.
$element
.
paren
t
(
'
[data-toggle="buttons-radio"]
'
)
var
$parent
=
this
.
$element
.
closes
t
(
'
[data-toggle="buttons-radio"]
'
)
$parent
&&
$parent
$parent
&&
$parent
.
find
(
'
.active
'
)
.
find
(
'
.active
'
)
...
...
js/tests/unit/bootstrap-button.js
View file @
601e2520
...
@@ -62,7 +62,7 @@ $(function () {
...
@@ -62,7 +62,7 @@ $(function () {
ok
(
btn
.
hasClass
(
'
active
'
),
'
btn has class active
'
)
ok
(
btn
.
hasClass
(
'
active
'
),
'
btn has class active
'
)
})
})
test
(
"
should toggle active when btn children are clicked within btn-group
"
,
function
()
{
test
(
"
should toggle active when btn children are clicked within btn-group
"
,
function
()
{
var
btngroup
=
$
(
'
<div class="btn-group" data-toggle="buttons-checkbox"></div>
'
)
var
btngroup
=
$
(
'
<div class="btn-group" data-toggle="buttons-checkbox"></div>
'
)
,
btn
=
$
(
'
<button class="btn">fat</button>
'
)
,
btn
=
$
(
'
<button class="btn">fat</button>
'
)
,
inner
=
$
(
'
<i></i>
'
)
,
inner
=
$
(
'
<i></i>
'
)
...
@@ -74,4 +74,23 @@ $(function () {
...
@@ -74,4 +74,23 @@ $(function () {
ok
(
btn
.
hasClass
(
'
active
'
),
'
btn has class active
'
)
ok
(
btn
.
hasClass
(
'
active
'
),
'
btn has class active
'
)
})
})
test
(
"
should check for closest matching toggle
"
,
function
()
{
var
group
=
$
(
"
<div data-toggle='buttons-radio'></div>
"
)
,
btn1
=
$
(
"
<button class='btn active'></button>
"
)
,
btn2
=
$
(
"
<button class='btn'></button>
"
)
,
wrap
=
$
(
"
<div></div>
"
)
wrap
.
append
(
btn1
,
btn2
)
group
.
append
(
wrap
)
.
appendTo
(
$
(
'
#qunit-fixture
'
))
ok
(
btn1
.
hasClass
(
'
active
'
),
'
btn1 has active class
'
)
ok
(
!
btn2
.
hasClass
(
'
active
'
),
'
btn2 does not have active class
'
)
btn2
.
click
()
ok
(
!
btn1
.
hasClass
(
'
active
'
),
'
btn1 does not have active class
'
)
ok
(
btn2
.
hasClass
(
'
active
'
),
'
btn2 has active class
'
)
})
})
})
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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