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
aaabe2a4
Commit
aaabe2a4
authored
12 years ago
by
Jacob Thornton
Browse files
Options
Download
Email Patches
Plain Diff
fix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild)
parent
66ac6e14
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
docs/assets/css/bootstrap.css
+4
-4
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-collapse.js
+1
-1
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap.js
+1
-1
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
+1
-1
docs/assets/js/bootstrap.min.js
js/bootstrap-collapse.js
+1
-1
js/bootstrap-collapse.js
js/tests/unit/bootstrap-collapse.js
+14
-0
js/tests/unit/bootstrap-collapse.js
with
22 additions
and
8 deletions
+22
-8
docs/assets/css/bootstrap.css
+
4
-
4
View file @
aaabe2a4
...
...
@@ -4651,15 +4651,15 @@ a.badge:hover {
-webkit-box-shadow
:
inset
0
-1px
0
rgba
(
0
,
0
,
0
,
0.15
);
-moz-box-shadow
:
inset
0
-1px
0
rgba
(
0
,
0
,
0
,
0.15
);
box-shadow
:
inset
0
-1px
0
rgba
(
0
,
0
,
0
,
0.15
);
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-ms-box-sizing
:
border-box
;
box-sizing
:
border-box
;
-webkit-transition
:
width
0.6s
ease
;
-moz-transition
:
width
0.6s
ease
;
-ms-transition
:
width
0.6s
ease
;
-o-transition
:
width
0.6s
ease
;
transition
:
width
0.6s
ease
;
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-ms-box-sizing
:
border-box
;
box-sizing
:
border-box
;
}
.progress-striped
.bar
{
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap-collapse.js
+
1
-
1
View file @
aaabe2a4
...
...
@@ -95,7 +95,7 @@
,
transition
:
function
(
method
,
startEvent
,
completeEvent
)
{
var
that
=
this
,
complete
=
function
()
{
if
(
startEvent
==
'
show
'
)
that
.
reset
()
if
(
startEvent
.
type
==
'
show
'
)
that
.
reset
()
that
.
transitioning
=
0
that
.
$element
.
trigger
(
completeEvent
)
}
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap.js
+
1
-
1
View file @
aaabe2a4
...
...
@@ -507,7 +507,7 @@
,
transition
:
function
(
method
,
startEvent
,
completeEvent
)
{
var
that
=
this
,
complete
=
function
()
{
if
(
startEvent
==
'
show
'
)
that
.
reset
()
if
(
startEvent
.
type
==
'
show
'
)
that
.
reset
()
that
.
transitioning
=
0
that
.
$element
.
trigger
(
completeEvent
)
}
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap.min.js
+
1
-
1
View file @
aaabe2a4
This diff is collapsed.
Click to expand it.
js/bootstrap-collapse.js
+
1
-
1
View file @
aaabe2a4
...
...
@@ -95,7 +95,7 @@
,
transition
:
function
(
method
,
startEvent
,
completeEvent
)
{
var
that
=
this
,
complete
=
function
()
{
if
(
startEvent
==
'
show
'
)
that
.
reset
()
if
(
startEvent
.
type
==
'
show
'
)
that
.
reset
()
that
.
transitioning
=
0
that
.
$element
.
trigger
(
completeEvent
)
}
...
...
This diff is collapsed.
Click to expand it.
js/tests/unit/bootstrap-collapse.js
+
14
-
0
View file @
aaabe2a4
...
...
@@ -37,4 +37,18 @@ $(function () {
.
collapse
(
'
show
'
)
})
test
(
"
should reset style to auto after finishing opening collapse
"
,
function
()
{
$
.
support
.
transition
=
false
stop
();
$
(
'
<div class="collapse" style="height: 0px"/>
'
)
.
bind
(
'
show
'
,
function
()
{
ok
(
this
.
style
.
height
==
'
0px
'
)
})
.
bind
(
'
shown
'
,
function
()
{
ok
(
this
.
style
.
height
==
'
auto
'
)
start
()
})
.
collapse
(
'
show
'
)
})
})
\ No newline at end of file
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