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
9c2e54bf
Commit
9c2e54bf
authored
10 years ago
by
fat
Browse files
Options
Download
Email Patches
Plain Diff
fixes
#14282
- Already Visible collapse gets closed when .collapse('show') is called
parent
ea0e1606
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
js/collapse.js
+1
-1
js/collapse.js
js/tests/unit/collapse.js
+32
-0
js/tests/unit/collapse.js
with
33 additions
and
1 deletion
+33
-1
js/collapse.js
+
1
-
1
View file @
9c2e54bf
...
@@ -124,7 +124,7 @@
...
@@ -124,7 +124,7 @@
var
data
=
$this
.
data
(
'
bs.collapse
'
)
var
data
=
$this
.
data
(
'
bs.collapse
'
)
var
options
=
$
.
extend
({},
Collapse
.
DEFAULTS
,
$this
.
data
(),
typeof
option
==
'
object
'
&&
option
)
var
options
=
$
.
extend
({},
Collapse
.
DEFAULTS
,
$this
.
data
(),
typeof
option
==
'
object
'
&&
option
)
if
(
!
data
&&
options
.
toggle
&&
option
==
'
show
'
)
option
=
!
option
if
(
!
data
&&
options
.
toggle
&&
option
==
'
show
'
)
option
s
.
toggle
=
false
if
(
!
data
)
$this
.
data
(
'
bs.collapse
'
,
(
data
=
new
Collapse
(
this
,
options
)))
if
(
!
data
)
$this
.
data
(
'
bs.collapse
'
,
(
data
=
new
Collapse
(
this
,
options
)))
if
(
typeof
option
==
'
string
'
)
data
[
option
]()
if
(
typeof
option
==
'
string
'
)
data
[
option
]()
})
})
...
...
This diff is collapsed.
Click to expand it.
js/tests/unit/collapse.js
+
32
-
0
View file @
9c2e54bf
...
@@ -102,6 +102,38 @@ $(function () {
...
@@ -102,6 +102,38 @@ $(function () {
$target
.
click
()
$target
.
click
()
})
})
test
(
'
should not close a collapse when initialized with "show" if already shown
'
,
function
()
{
stop
()
expect
(
0
)
var
$test
=
$
(
'
<div id="test1" class="in"/>
'
)
.
appendTo
(
'
#qunit-fixture
'
)
.
on
(
'
hide.bs.collapse
'
,
function
()
{
ok
(
false
)
})
$test
.
bootstrapCollapse
(
'
show
'
)
setTimeout
(
start
,
0
)
})
test
(
'
should open a collapse when initialized with "show" if not already shown
'
,
function
()
{
stop
()
expect
(
1
)
var
$test
=
$
(
'
<div id="test1" />
'
)
.
appendTo
(
'
#qunit-fixture
'
)
.
on
(
'
show.bs.collapse
'
,
function
()
{
ok
(
true
)
})
$test
.
bootstrapCollapse
(
'
show
'
)
setTimeout
(
start
,
0
)
})
test
(
'
should remove "collapsed" class from active accordion target
'
,
function
()
{
test
(
'
should remove "collapsed" class from active accordion target
'
,
function
()
{
stop
()
stop
()
...
...
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