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
f97dd5af
Commit
f97dd5af
authored
11 years ago
by
fat
Browse files
Options
Download
Email Patches
Plain Diff
rebuild doe
parent
13cad506
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/assets/js/bootstrap.js
+13
-8
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
+1
-1
docs/assets/js/bootstrap.min.js
with
14 additions
and
9 deletions
+14
-9
docs/assets/js/bootstrap.js
+
13
-
8
View file @
f97dd5af
...
...
@@ -502,6 +502,10 @@
Collapse
.
prototype
.
show
=
function
()
{
if
(
this
.
transitioning
||
this
.
$element
.
hasClass
(
'
in
'
))
return
var
startEvent
=
$
.
Event
(
'
show.bs.collapse
'
)
this
.
$element
.
trigger
(
startEvent
)
if
(
startEvent
.
isDefaultPrevented
())
return
var
dimension
=
this
.
dimension
()
var
scroll
=
$
.
camelCase
([
'
scroll
'
,
dimension
].
join
(
'
-
'
))
var
actives
=
this
.
$parent
&&
this
.
$parent
.
find
(
'
> .accordion-group > .in
'
)
...
...
@@ -514,16 +518,21 @@
}
this
.
$element
[
dimension
](
0
)
this
.
transition
(
'
addClass
'
,
$
.
Event
(
'
show.bs.collapse
'
),
'
shown.bs.collapse
'
)
this
.
transition
(
'
addClass
'
,
'
shown.bs.collapse
'
)
if
(
$
.
support
.
transition
)
this
.
$element
[
dimension
](
this
.
$element
[
0
][
scroll
])
}
Collapse
.
prototype
.
hide
=
function
()
{
if
(
this
.
transitioning
||
!
this
.
$element
.
hasClass
(
'
in
'
))
return
var
startEvent
=
$
.
Event
(
'
hide.bs.collapse
'
)
this
.
$element
.
trigger
(
startEvent
)
if
(
startEvent
.
isDefaultPrevented
())
return
var
dimension
=
this
.
dimension
()
this
.
reset
(
this
.
$element
[
dimension
]())
this
.
transition
(
'
removeClass
'
,
$
.
Event
(
'
hide.bs.collapse
'
),
'
hidden
'
)
this
.
transition
(
'
removeClass
'
,
'
shown.bs.
hidden
'
)
this
.
$element
[
dimension
](
0
)
}
...
...
@@ -540,18 +549,14 @@
return
this
}
Collapse
.
prototype
.
transition
=
function
(
method
,
startEvent
,
completeEvent
)
{
Collapse
.
prototype
.
transition
=
function
(
method
,
completeEvent
)
{
var
that
=
this
var
complete
=
function
()
{
if
(
startEvent
.
type
==
'
show
'
)
that
.
reset
()
if
(
completeEvent
==
'
shown.bs.collapse
'
)
that
.
reset
()
that
.
transitioning
=
0
that
.
$element
.
trigger
(
completeEvent
)
}
this
.
$element
.
trigger
(
startEvent
)
if
(
startEvent
.
isDefaultPrevented
())
return
this
.
transitioning
=
1
this
.
$element
[
method
](
'
in
'
)
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap.min.js
+
1
-
1
View file @
f97dd5af
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