aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/visual/accordion/accordion_option_fillSpace_true.html50
-rw-r--r--ui/ui.accordion.js2
2 files changed, 51 insertions, 1 deletions
diff --git a/tests/visual/accordion/accordion_option_fillSpace_true.html b/tests/visual/accordion/accordion_option_fillSpace_true.html
new file mode 100644
index 000000000..06a06b4fb
--- /dev/null
+++ b/tests/visual/accordion/accordion_option_fillSpace_true.html
@@ -0,0 +1,50 @@
+<!doctype html>
+<html lang="en">
+<head>
+ <title>Accordion Visual Test : Accordion option autoHeight true</title>
+ <link rel="stylesheet" href="../visual.css" type="text/css" />
+ <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
+ <script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
+ <script type="text/javascript" src="../../../ui/ui.core.js"></script>
+ <script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+ <script type="text/javascript">
+ $(function() {
+ $("#accordion").accordion({
+ fillSpace: true
+ });
+ })
+ </script>
+</head>
+<body>
+
+<div style="height: 500px; width: 500px; border: 1px solid red;">
+ <div id="accordion" style="width:490px;">
+ <h3><a href="#">Accordion Header 1</a></h3>
+ <div>
+ Accordion Content 1
+ </div>
+ <h3><a href="#">Accordion Header 2</a></h3>
+ <div>
+ Accordion Content 2
+ <p>paragraph</p>
+ <p>paragraph</p>
+ <p>paragraph</p>
+ <p>paragraph</p>
+ <p>paragraph</p>
+ <p>paragraph</p>
+ <p>paragraph</p>
+ </div>
+ <h3><a href="#">Accordion Header 3</a></h3>
+ <div>
+ Accordion Content 3
+ <ul>
+ <li>list item</li>
+ <li>list item</li>
+ <li>list item</li>
+ </ul>
+ </div>
+ </div>
+</div>
+
+</body>
+</html>
diff --git a/ui/ui.accordion.js b/ui/ui.accordion.js
index 1b8337547..911499baa 100644
--- a/ui/ui.accordion.js
+++ b/ui/ui.accordion.js
@@ -213,7 +213,7 @@ $.widget("ui.accordion", {
if($.browser.msie) { this.element.parent().css('overflow', defOverflow); }
this.headers.each(function() {
- maxHeight -= $(this).outerHeight();
+ maxHeight -= $(this).outerHeight(true);
});
var maxPadding = 0;