Skip to content

Commit 6660640

Browse files
scottgonzalezscottgonzalez
committed
Accordion: Force the width of the accordion panel during animation when animating from a fully collapsed state. Fixes #5540 - Accordion: Jumpy animation when opening a panel after closing all.
The animation code should be refactored.
1 parent 1b2f6ce commit 6660640

File tree

2 files changed

+50
-77
lines changed

2 files changed

+50
-77
lines changed

‎demos/accordion/default.html

Lines changed: 27 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -4,82 +4,43 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Accordion - Default functionality</title>
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
7-
<script src="../../jquery-1.4.4.js"></script>
7+
<script src="http://code.jquery.com/jquery-git.js"></script>
88
<script src="../../ui/jquery.ui.core.js"></script>
99
<script src="../../ui/jquery.ui.widget.js"></script>
1010
<script src="../../ui/jquery.ui.accordion.js"></script>
1111
<link rel="stylesheet" href="../demos.css">
12+
<style type="text/css">
13+
#accordion {
14+
width: 600px;
15+
}
16+
</style>
1217
<script>
13-
$(function() {
14-
$( "#accordion" ).accordion();
18+
$(function(){
19+
20+
$("#accordion").accordion({
21+
autoHeight: false,
22+
active: false,
23+
collapsible: true
24+
});
25+
1526
});
1627
</script>
1728
</head>
1829
<body>
1930

20-
<div class="demo">
21-
22-
<div id="accordion">
23-
<h3><a href="#">Section 1</a></h3>
24-
<div>
25-
<p>
26-
Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer
27-
ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit
28-
amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut
29-
odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.
30-
</p>
31-
</div>
32-
<h3><a href="#">Section 2</a></h3>
33-
<div>
34-
<p>
35-
Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet
36-
purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor
37-
velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In
38-
suscipit faucibus urna.
39-
</p>
40-
</div>
41-
<h3><a href="#">Section 3</a></h3>
42-
<div>
43-
<p>
44-
Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis.
45-
Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero
46-
ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis
47-
lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui.
48-
</p>
49-
<ul>
50-
<li>List item one</li>
51-
<li>List item two</li>
52-
<li>List item three</li>
53-
</ul>
31+
<div id="accordion">
32+
<h3><a href="#section1">Header</a></h3>
33+
<div>
34+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dapibus eleifend odio. Suspendisse porta pretium urna, vitae euismod turpis pharetra elementum. Donec malesuada laoreet est vel bibendum. Donec tempus, urna sit amet consequat molestie, sapien tellus pellentesque lectus, consectetur volutpat urna dolor eget elit. Donec tempus feugiat nulla in egestas. Duis eleifend sollicitudin lobortis. Vivamus ornare, ipsum et laoreet blandit, tortor nulla congue justo, ac eleifend massa neque ac eros. Nullam condimentum, nibh sed rutrum faucibus, velit metus malesuada est, lacinia vulputate ante nibh ut massa. Quisque et elementum nulla. Mauris a sem in odio cursus varius in nec ante. Vestibulum accumsan massa et dolor tincidunt ac laoreet massa imperdiet. Mauris eleifend turpis non sapien accumsan egestas. Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
35+
</div>
36+
<h3><a href="#section1">Header</a></h3>
37+
<div>
38+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dapibus eleifend odio. Suspendisse porta pretium urna, vitae euismod turpis pharetra elementum. Donec malesuada laoreet est vel bibendum. Donec tempus, urna sit amet consequat molestie, sapien tellus pellentesque lectus, consectetur volutpat urna dolor eget elit. Donec tempus feugiat nulla in egestas. Duis eleifend sollicitudin lobortis. Vivamus ornare, ipsum et laoreet blandit, tortor nulla congue justo, ac eleifend massa neque ac eros. Nullam condimentum, nibh sed rutrum faucibus, velit metus malesuada est, lacinia vulputate ante nibh ut massa. Quisque et elementum nulla. Mauris a sem in odio cursus varius in nec ante. Vestibulum accumsan massa et dolor tincidunt ac laoreet massa imperdiet. Mauris eleifend turpis non sapien accumsan egestas. Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
39+
</div>
40+
<h3><a href="#section1">Header</a></h3>
41+
<div>
42+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dapibus eleifend odio. Suspendisse porta pretium urna, vitae euismod turpis pharetra elementum. Donec malesuada laoreet est vel bibendum. Donec tempus, urna sit amet consequat molestie, sapien tellus pellentesque lectus, consectetur volutpat urna dolor eget elit. Donec tempus feugiat nulla in egestas. Duis eleifend sollicitudin lobortis. Vivamus ornare, ipsum et laoreet blandit, tortor nulla congue justo, ac eleifend massa neque ac eros. Nullam condimentum, nibh sed rutrum faucibus, velit metus malesuada est, lacinia vulputate ante nibh ut massa. Quisque et elementum nulla. Mauris a sem in odio cursus varius in nec ante. Vestibulum accumsan massa et dolor tincidunt ac laoreet massa imperdiet. Mauris eleifend turpis non sapien accumsan egestas. Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>
43+
</div>
5444
</div>
55-
<h3><a href="#">Section 4</a></h3>
56-
<div>
57-
<p>
58-
Cras dictum. Pellentesque habitant morbi tristique senectus et netus
59-
et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in
60-
faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia
61-
mauris vel est.
62-
</p>
63-
<p>
64-
Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus.
65-
Class aptent taciti sociosqu ad litora torquent per conubia nostra, per
66-
inceptos himenaeos.
67-
</p>
68-
</div>
69-
</div>
70-
71-
</div><!-- End demo -->
72-
73-
<div class="demo-description">
74-
<p>
75-
Click headers to expand/collapse content that is broken into logical sections, much like tabs.
76-
Optionally, toggle sections open/closed on mouseover.
77-
</p>
78-
<p>
79-
The underlying HTML markup is a series of headers (H3 tags) and content divs so the content is
80-
usable without JavaScript.
81-
</p>
82-
</div><!-- End demo-description -->
83-
8445
</body>
8546
</html>

‎ui/jquery.ui.accordion.js

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -499,16 +499,34 @@ $.extend( $.ui.accordion, {
499499
version: "@VERSION",
500500
animations: {
501501
slide: function( options, additions ) {
502+
var overflow = options.toShow.css( "overflow" ),
503+
percentDone = 0,
504+
showProps = {},
505+
hideProps = {},
506+
fxAttrs = [ "height", "paddingTop", "paddingBottom" ],
507+
originalWidth;
502508
options = $.extend({
503509
easing: "swing",
504510
duration: 300
505511
}, options, additions );
506512
if ( !options.toHide.size() ) {
507-
options.toShow.animate({
508-
height: "show",
509-
paddingTop: "show",
510-
paddingBottom: "show"
511-
}, options );
513+
originalWidth = options.toShow[0].style.width;
514+
options.toShow
515+
.show()
516+
.width( options.toShow.width() )
517+
.hide()
518+
.animate({
519+
height: "show",
520+
paddingTop: "show",
521+
paddingBottom: "show"
522+
}, {
523+
duration: options.duration,
524+
easing: options.easing,
525+
complete: function() {
526+
options.toShow.width( originalWidth );
527+
options.complete();
528+
}
529+
});
512530
return;
513531
}
514532
if ( !options.toShow.size() ) {
@@ -519,12 +537,6 @@ $.extend( $.ui.accordion, {
519537
}, options );
520538
return;
521539
}
522-
var overflow = options.toShow.css( "overflow" ),
523-
percentDone = 0,
524-
showProps = {},
525-
hideProps = {},
526-
fxAttrs = [ "height", "paddingTop", "paddingBottom" ],
527-
originalWidth;
528540
// fix width before calculating height of hidden element
529541
var s = options.toShow;
530542
originalWidth = s[0].style.width;

0 commit comments

Comments
 (0)