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
aaabe2a4
Commit
aaabe2a4
authored
Apr 24, 2012
by
Jacob Thornton
Browse files
Options
Browse Files
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
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
8 deletions
+22
-8
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+4
-4
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-collapse.js
+1
-1
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.js
+1
-1
docs/assets/js/bootstrap.min.js
docs/assets/js/bootstrap.min.js
+1
-1
js/bootstrap-collapse.js
js/bootstrap-collapse.js
+1
-1
js/tests/unit/bootstrap-collapse.js
js/tests/unit/bootstrap-collapse.js
+14
-0
No files found.
docs/assets/css/bootstrap.css
View file @
aaabe2a4
...
@@ -4651,15 +4651,15 @@ a.badge:hover {
...
@@ -4651,15 +4651,15 @@ a.badge:hover {
-webkit-box-shadow
:
inset
0
-1px
0
rgba
(
0
,
0
,
0
,
0.15
);
-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
);
-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
);
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
;
-webkit-transition
:
width
0.6s
ease
;
-moz-transition
:
width
0.6s
ease
;
-moz-transition
:
width
0.6s
ease
;
-ms-transition
:
width
0.6s
ease
;
-ms-transition
:
width
0.6s
ease
;
-o-transition
:
width
0.6s
ease
;
-o-transition
:
width
0.6s
ease
;
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
{
.progress-striped
.bar
{
...
...
docs/assets/js/bootstrap-collapse.js
View file @
aaabe2a4
...
@@ -95,7 +95,7 @@
...
@@ -95,7 +95,7 @@
,
transition
:
function
(
method
,
startEvent
,
completeEvent
)
{
,
transition
:
function
(
method
,
startEvent
,
completeEvent
)
{
var
that
=
this
var
that
=
this
,
complete
=
function
()
{
,
complete
=
function
()
{
if
(
startEvent
==
'
show
'
)
that
.
reset
()
if
(
startEvent
.
type
==
'
show
'
)
that
.
reset
()
that
.
transitioning
=
0
that
.
transitioning
=
0
that
.
$element
.
trigger
(
completeEvent
)
that
.
$element
.
trigger
(
completeEvent
)
}
}
...
...
docs/assets/js/bootstrap.js
View file @
aaabe2a4
...
@@ -507,7 +507,7 @@
...
@@ -507,7 +507,7 @@
,
transition
:
function
(
method
,
startEvent
,
completeEvent
)
{
,
transition
:
function
(
method
,
startEvent
,
completeEvent
)
{
var
that
=
this
var
that
=
this
,
complete
=
function
()
{
,
complete
=
function
()
{
if
(
startEvent
==
'
show
'
)
that
.
reset
()
if
(
startEvent
.
type
==
'
show
'
)
that
.
reset
()
that
.
transitioning
=
0
that
.
transitioning
=
0
that
.
$element
.
trigger
(
completeEvent
)
that
.
$element
.
trigger
(
completeEvent
)
}
}
...
...
docs/assets/js/bootstrap.min.js
View file @
aaabe2a4
This diff is collapsed.
Click to expand it.
js/bootstrap-collapse.js
View file @
aaabe2a4
...
@@ -95,7 +95,7 @@
...
@@ -95,7 +95,7 @@
,
transition
:
function
(
method
,
startEvent
,
completeEvent
)
{
,
transition
:
function
(
method
,
startEvent
,
completeEvent
)
{
var
that
=
this
var
that
=
this
,
complete
=
function
()
{
,
complete
=
function
()
{
if
(
startEvent
==
'
show
'
)
that
.
reset
()
if
(
startEvent
.
type
==
'
show
'
)
that
.
reset
()
that
.
transitioning
=
0
that
.
transitioning
=
0
that
.
$element
.
trigger
(
completeEvent
)
that
.
$element
.
trigger
(
completeEvent
)
}
}
...
...
js/tests/unit/bootstrap-collapse.js
View file @
aaabe2a4
...
@@ -37,4 +37,18 @@ $(function () {
...
@@ -37,4 +37,18 @@ $(function () {
.
collapse
(
'
show
'
)
.
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
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