accordion: fix for #4754; related tests were failing before, fixed them, too (checked...

diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js
index 95edae597455806751a47d7b43e0885b917e8a53..bb844f83805da6a759f45276438498932cdcaa23 100644 (file)
--- a/tests/unit/accordion/accordion_options.js
+++ b/tests/unit/accordion/accordion_options.js
@@ -55,16 +55,16 @@ test("{ animated: String }", function() {
 
 test("{ autoHeight: true }, default", function() {
        $('#navigation').accordion({ autoHeight: true });
-       equals( $('#navigation > li:eq(0) > ul').height(), 112 );
-       equals( $('#navigation > li:eq(1) > ul').height(), 112 );
-       equals( $('#navigation > li:eq(2) > ul').height(), 112 );
+       equals( $('#navigation > li:eq(0) > ul').height(), 126 );
+       equals( $('#navigation > li:eq(1) > ul').height(), 126 );
+       equals( $('#navigation > li:eq(2) > ul').height(), 126 );
 });
 
 test("{ autoHeight: false }", function() {
        $('#navigation').accordion({ autoHeight: false });
-       equals( $('#navigation > li:eq(0) > ul').height(), 80 );
-       equals( $('#navigation > li:eq(1) > ul').height(), 112 );
-       equals( $('#navigation > li:eq(2) > ul').height(), 48 );
+       equals( $('#navigation > li:eq(0) > ul').height(), 90 );
+       equals( $('#navigation > li:eq(1) > ul').height(), 126 );
+       equals( $('#navigation > li:eq(2) > ul').height(), 54 );
 });
 
 test("{ clearStyle: false }, default", function() {

diff --git a/ui/ui.accordion.js b/ui/ui.accordion.js
index a11cf94d2c086638e502c0c657f70db6cf816ffd..f05a3b1a5b3df632b201a3cef6cf15944d2d3566 100644 (file)
--- a/ui/ui.accordion.js
+++ b/ui/ui.accordion.js
@@ -222,7 +222,7 @@ $.widget("ui.accordion", {
                } else if ( o.autoHeight ) {
                        maxHeight = 0;
                        this.headers.next().each(function() {
-                               maxHeight = Math.max(maxHeight, $(this).outerHeight());
+                               maxHeight = Math.max(maxHeight, $(this).height());
                        }).height(maxHeight);
                }