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
cb8dcfce
Commit
cb8dcfce
authored
Mar 20, 2012
by
Jacob Thornton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
if transitioning collapse, don't start new transition
parent
663e41d7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
8 deletions
+32
-8
docs/assets/bootstrap.zip
docs/assets/bootstrap.zip
+0
-0
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-collapse.js
+16
-4
js/bootstrap-collapse.js
js/bootstrap-collapse.js
+16
-4
No files found.
docs/assets/bootstrap.zip
View file @
cb8dcfce
No preview for this file type
docs/assets/js/bootstrap-collapse.js
View file @
cb8dcfce
...
...
@@ -42,11 +42,18 @@
}
,
show
:
function
()
{
var
dimension
=
this
.
dimension
()
,
scroll
=
$
.
camelCase
([
'
scroll
'
,
dimension
].
join
(
'
-
'
))
,
actives
=
this
.
$parent
&&
this
.
$parent
.
find
(
'
> .accordion-group > .in
'
)
var
dimension
,
scroll
,
actives
,
hasData
if
(
this
.
transitioning
)
return
dimension
=
this
.
dimension
()
scroll
=
$
.
camelCase
([
'
scroll
'
,
dimension
].
join
(
'
-
'
))
actives
=
this
.
$parent
&&
this
.
$parent
.
find
(
'
> .accordion-group > .in
'
)
hasData
if
(
actives
&&
actives
.
length
)
{
hasData
=
actives
.
data
(
'
collapse
'
)
actives
.
collapse
(
'
hide
'
)
...
...
@@ -59,7 +66,9 @@
}
,
hide
:
function
()
{
var
dimension
=
this
.
dimension
()
var
dimension
if
(
this
.
transitioning
)
return
dimension
=
this
.
dimension
()
this
.
reset
(
this
.
$element
[
dimension
]())
this
.
transition
(
'
removeClass
'
,
'
hide
'
,
'
hidden
'
)
this
.
$element
[
dimension
](
0
)
...
...
@@ -82,9 +91,12 @@
var
that
=
this
,
complete
=
function
()
{
if
(
startEvent
==
'
show
'
)
that
.
reset
()
that
.
transitioning
=
0
that
.
$element
.
trigger
(
completeEvent
)
}
this
.
transitioning
=
1
this
.
$element
.
trigger
(
startEvent
)
[
method
](
'
in
'
)
...
...
js/bootstrap-collapse.js
View file @
cb8dcfce
...
...
@@ -42,11 +42,18 @@
}
,
show
:
function
()
{
var
dimension
=
this
.
dimension
()
,
scroll
=
$
.
camelCase
([
'
scroll
'
,
dimension
].
join
(
'
-
'
))
,
actives
=
this
.
$parent
&&
this
.
$parent
.
find
(
'
> .accordion-group > .in
'
)
var
dimension
,
scroll
,
actives
,
hasData
if
(
this
.
transitioning
)
return
dimension
=
this
.
dimension
()
scroll
=
$
.
camelCase
([
'
scroll
'
,
dimension
].
join
(
'
-
'
))
actives
=
this
.
$parent
&&
this
.
$parent
.
find
(
'
> .accordion-group > .in
'
)
hasData
if
(
actives
&&
actives
.
length
)
{
hasData
=
actives
.
data
(
'
collapse
'
)
actives
.
collapse
(
'
hide
'
)
...
...
@@ -59,7 +66,9 @@
}
,
hide
:
function
()
{
var
dimension
=
this
.
dimension
()
var
dimension
if
(
this
.
transitioning
)
return
dimension
=
this
.
dimension
()
this
.
reset
(
this
.
$element
[
dimension
]())
this
.
transition
(
'
removeClass
'
,
'
hide
'
,
'
hidden
'
)
this
.
$element
[
dimension
](
0
)
...
...
@@ -82,9 +91,12 @@
var
that
=
this
,
complete
=
function
()
{
if
(
startEvent
==
'
show
'
)
that
.
reset
()
that
.
transitioning
=
0
that
.
$element
.
trigger
(
completeEvent
)
}
this
.
transitioning
=
1
this
.
$element
.
trigger
(
startEvent
)
[
method
](
'
in
'
)
...
...
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