Skip to content

Commit 7a58030

Browse files
jzaeffererjzaefferer
committed
accordion: Fixed #3682, setting overflow:auto for fillSpace:true accordions; added demo
1 parent d162087 commit 7a58030

3 files changed

Lines changed: 49 additions & 3 deletions

File tree

‎demos/accordion/fillspace.html‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<title>jQuery UI Accordion - FillSpace Demo</title>
5+
<link type="text/css" href="../demos.css" rel="stylesheet" />
6+
<link type="text/css" href="../../themes/default/ui.all.css" rel="stylesheet" />
7+
<script type="text/javascript" src="../../jquery-1.2.6.js"></script>
8+
<script type="text/javascript" src="../../ui/ui.core.js"></script>
9+
<script type="text/javascript" src="../../ui/ui.accordion.js"></script>
10+
<script type="text/javascript">
11+
$(function() {
12+
$("#accordion-mouseover").accordion({
13+
event: "mouseover",
14+
header: "h3",
15+
fillSpace: true
16+
});
17+
})
18+
</script>
19+
</head>
20+
<body>
21+
22+
<div id="accordion-mouseover" style="width: 200px; height: 250px">
23+
<div>
24+
<h3><a href="#">Nullam blandit</a></h3>
25+
<div>
26+
Duis pretium. Nullam venenatis. Donec ornare. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed sit amet magna ac lorem elementum euismod. Nulla eu leo. Phasellus purus arcu, semper sed, scelerisque eget, molestie vitae, ante. Nam et purus. Vivamus nec lacus. Mauris pulvinar vehicula orci. Nunc quam metus, iaculis ut, viverra at, tempor vel, arcu. Aliquam dictum massa non diam. Pellentesque vel odio. Integer volutpat placerat velit. Phasellus rhoncus, diam ac fermentum suscipit, velit est eleifend dolor, et cursus massa pede et diam. Cras eu tortor. Quisque vitae ante nec erat venenatis luctus. Donec commodo suscipit nulla. Nunc nec ligula id nulla dictum dictum.
27+
</div>
28+
</div>
29+
<div>
30+
<h3><a href="#">Aliquam nulla</a></h3>
31+
<div>
32+
Ut varius. Cras gravida, ante vel porttitor porttitor, sapien magna eleifend dolor, sit amet eleifend justo neque sit amet neque. Donec a nisl sed orci pharetra sodales. Proin ullamcorper, mi sit amet tempor blandit, dolor diam vestibulum nibh, eu sollicitudin lorem risus quis tellus. Ut scelerisque consequat ipsum. Vivamus tellus velit, faucibus eu, venenatis sit amet, varius eu, turpis. In molestie nisi id purus. Pellentesque et dolor. Proin metus nisl, sollicitudin at, aliquet eu, porta eget, est. Donec ut libero. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae;
33+
</div>
34+
</div>
35+
<div>
36+
<h3><a href="#">Proin tincidunt</a></h3>
37+
<div>
38+
Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Ut quam massa, scelerisque sit amet, lacinia sit amet, facilisis ullamcorper, nunc. Nulla vehicula auctor felis. Nullam lobortis erat quis metus. Maecenas molestie, quam lobortis tincidunt ultricies, dolor ante rutrum nisl, in vestibulum nisi odio consectetur enim. Nam tellus felis, ultrices nec, elementum malesuada, congue quis, lacus. Aliquam hendrerit interdum eros. Etiam egestas iaculis urna. Cras venenatis pharetra nunc. Etiam scelerisque mauris eget massa. Nam nec lectus eu purus tempus feugiat. Nunc quam. In facilisis venenatis nisl. Nullam id sapien. Nullam lacinia quam facilisis sem. Nullam facilisis convallis justo. Praesent dictum facilisis purus. Integer cursus ligula at nibh. Mauris in felis id nisl porttitor auctor. Quisque erat.
39+
</div>
40+
</div>
41+
</div>
42+
43+
</body>
44+
</html>

‎demos/accordion/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<dt>Accordion</dt>
1717
<dd><a href="default.html">Default</a></dd>
1818
<dd><a href="mouseover.html">Mouseover</a></dd>
19+
<dd><a href="fillspace.html">FillSpace</a></dd>
1920
</dl>
2021

2122
</body>

‎ui/ui.accordion.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ $.widget("ui.accordion", {
141141
var maxPadding = 0;
142142
options.headers.next().each(function() {
143143
maxPadding = Math.max(maxPadding, $(this).innerHeight() - $(this).height());
144-
}).height(maxHeight - maxPadding);
144+
}).height(maxHeight - maxPadding)
145+
.css('overflow', 'auto');
145146
} else if ( options.autoHeight ) {
146147
maxHeight = 0;
147148
options.headers.next().each(function() {
@@ -207,15 +208,15 @@ function toggle(toShow, toHide, data, clickedActive, down) {
207208
toHide: toHide,
208209
complete: complete,
209210
down: down,
210-
autoHeight: options.autoHeight
211+
autoHeight: options.autoHeight || options.fillSpace
211212
};
212213
} else {
213214
animOptions = {
214215
toShow: toShow,
215216
toHide: toHide,
216217
complete: complete,
217218
down: down,
218-
autoHeight: options.autoHeight
219+
autoHeight: options.autoHeight || options.fillSpace
219220
};
220221
}
221222

0 commit comments

Comments
 (0)