diff options
| -rw-r--r-- | tests/unit/accordion/accordion_options.js | 12 | ||||
| -rw-r--r-- | ui/ui.accordion.js | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js index 95edae597..bb844f838 100644 --- 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 a11cf94d2..f05a3b1a5 100644 --- 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); } |