Skip to content
GitLab
Explore
Projects
Groups
Snippets
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
cb8dcfce
Commit
cb8dcfce
authored
13 years ago
by
Jacob Thornton
Browse files
Options
Download
Email Patches
Plain Diff
if transitioning collapse, don't start new transition
parent
663e41d7
2 merge requests
!2929
Responsive video - from zurp's foundation
,
!2875
2.0.3 wip
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/assets/bootstrap.zip
+0
-0
docs/assets/bootstrap.zip
docs/assets/js/bootstrap-collapse.js
+16
-4
docs/assets/js/bootstrap-collapse.js
js/bootstrap-collapse.js
+16
-4
js/bootstrap-collapse.js
with
32 additions
and
8 deletions
+32
-8
docs/assets/bootstrap.zip
+
0
-
0
View file @
cb8dcfce
No preview for this file type
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-collapse.js
+
16
-
4
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
'
)
...
...
This diff is collapsed.
Click to expand it.
js/bootstrap-collapse.js
+
16
-
4
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
'
)
...
...
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
Menu
Explore
Projects
Groups
Snippets