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
e811a241
Commit
e811a241
authored
Oct 22, 2014
by
Heinrich Fenkart
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't fire show event if show is prevented because other element is still transitioning
Fixes #14844. Closes #14845.
parent
a096c3f6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
5 deletions
+44
-5
js/collapse.js
js/collapse.js
+9
-5
js/tests/unit/collapse.js
js/tests/unit/collapse.js
+35
-0
No files found.
js/collapse.js
View file @
e811a241
...
@@ -38,17 +38,21 @@
...
@@ -38,17 +38,21 @@
Collapse
.
prototype
.
show
=
function
()
{
Collapse
.
prototype
.
show
=
function
()
{
if
(
this
.
transitioning
||
this
.
$element
.
hasClass
(
'
in
'
))
return
if
(
this
.
transitioning
||
this
.
$element
.
hasClass
(
'
in
'
))
return
var
activesData
var
actives
=
this
.
$parent
&&
this
.
$parent
.
find
(
'
> .panel
'
).
children
(
'
.in, .collapsing
'
)
if
(
actives
&&
actives
.
length
)
{
activesData
=
actives
.
data
(
'
bs.collapse
'
)
if
(
activesData
&&
activesData
.
transitioning
)
return
}
var
startEvent
=
$
.
Event
(
'
show.bs.collapse
'
)
var
startEvent
=
$
.
Event
(
'
show.bs.collapse
'
)
this
.
$element
.
trigger
(
startEvent
)
this
.
$element
.
trigger
(
startEvent
)
if
(
startEvent
.
isDefaultPrevented
())
return
if
(
startEvent
.
isDefaultPrevented
())
return
var
actives
=
this
.
$parent
&&
this
.
$parent
.
find
(
'
> .panel
'
).
children
(
'
.in, .collapsing
'
)
if
(
actives
&&
actives
.
length
)
{
if
(
actives
&&
actives
.
length
)
{
var
hasData
=
actives
.
data
(
'
bs.collapse
'
)
if
(
hasData
&&
hasData
.
transitioning
)
return
Plugin
.
call
(
actives
,
'
hide
'
)
Plugin
.
call
(
actives
,
'
hide
'
)
ha
sData
||
actives
.
data
(
'
bs.collapse
'
,
null
)
active
sData
||
actives
.
data
(
'
bs.collapse
'
,
null
)
}
}
var
dimension
=
this
.
dimension
()
var
dimension
=
this
.
dimension
()
...
...
js/tests/unit/collapse.js
View file @
e811a241
...
@@ -263,4 +263,39 @@ $(function () {
...
@@ -263,4 +263,39 @@ $(function () {
$target3
.
click
()
$target3
.
click
()
})
})
test
(
'
should not fire show event if show is prevented because other element is still transitioning
'
,
function
()
{
stop
()
var
accordionHTML
=
'
<div id="accordion">
'
+
'
<div class="panel"/>
'
+
'
<div class="panel"/>
'
+
'
</div>
'
var
showFired
=
false
var
$groups
=
$
(
accordionHTML
).
appendTo
(
'
#qunit-fixture
'
).
find
(
'
.panel
'
)
var
$target1
=
$
(
'
<a data-toggle="collapse" href="#body1" data-parent="#accordion"/>
'
).
appendTo
(
$groups
.
eq
(
0
))
$
(
'
<div id="body1" class="collapse"/>
'
)
.
appendTo
(
$groups
.
eq
(
0
))
.
on
(
'
show.bs.collapse
'
,
function
()
{
showFired
=
true
})
var
$target2
=
$
(
'
<a data-toggle="collapse" href="#body2" data-parent="#accordion"/>
'
).
appendTo
(
$groups
.
eq
(
1
))
var
$body2
=
$
(
'
<div id="body2" class="collapse"/>
'
).
appendTo
(
$groups
.
eq
(
1
))
$target2
.
click
()
$body2
.
toggleClass
(
'
in collapsing
'
)
.
data
(
'
bs.collapse
'
).
transitioning
=
1
$target1
.
click
()
setTimeout
(
function
()
{
ok
(
!
showFired
,
'
show event didn
\'
t fire
'
)
start
()
},
1
)
})
})
})
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