accordion: fix for #4754; related tests were failing before, fixed th…

…em, too (checked to correct sizes in Firebug)
jquery · Aug 6, 2009 · 425e76355a289341eb588874e04b82afdc9eeb99 · 425e763
1 parent 20e6ef3
commit 425e76355a289341eb588874e04b82afdc9eeb99
Unified Split

Showing with 7 additions and 7 deletions.

+6 −6 tests/unit/accordion/accordion_options.js

+1 −1 ui/ui.accordion.js
diff --git 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
@@ -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);
 		}