From 33111b6693e120f97469c613249289fd385bdc2c Mon Sep 17 00:00:00 2001 From: Alyosha Pushak Date: Sun, 12 Apr 2015 19:17:16 -0700 Subject: [PATCH] Accordion: Correct height calculated when closed Fixes #11938 Closes gh-1536 --- tests/unit/accordion/accordion.html | 19 ++++++++++++++++++- tests/unit/accordion/options.js | 16 ++++++++++++++++ ui/widgets/accordion.js | 7 +++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html index 683b87456cb..ce58567552b 100644 --- a/tests/unit/accordion/accordion.html +++ b/tests/unit/accordion/accordion.html @@ -8,12 +8,16 @@ @@ -109,6 +113,19 @@

Drums

+
+
+

Header

+
+

+ The calculated height of this accordion should be the same + regardless of whether the accordion was collapsed or not + when the height was calculated. +

+
+
+
+ diff --git a/tests/unit/accordion/options.js b/tests/unit/accordion/options.js index c9b2e3aaf15..228a8be4063 100644 --- a/tests/unit/accordion/options.js +++ b/tests/unit/accordion/options.js @@ -48,6 +48,22 @@ test( "{ active: false }", function() { strictEqual( element.accordion( "option", "active" ), 0 ); } ); +// http://bugs.jqueryui.com/ticket/11938 +test( "{ active: false, collapsible: true }", function() { + expect( 1 ); + var element = $( "#collapsible" ).accordion(), + height = element.outerHeight(); + + element + .accordion( "destroy" ) + .accordion( { + active: false, + collapsible: true + } ) + .accordion( "option", "active", 0 ); + equal( element.outerHeight(), height ); +} ); + test( "{ active: Number }", function() { expect( 8 ); var element = $( "#list1" ).accordion( { diff --git a/ui/widgets/accordion.js b/ui/widgets/accordion.js index 14b3f730327..359b4c46f62 100644 --- a/ui/widgets/accordion.js +++ b/ui/widgets/accordion.js @@ -373,7 +373,14 @@ return $.widget( "ui.accordion", { maxHeight = 0; this.headers.next() .each( function() { + var isVisible = $( this ).is( ":visible" ); + if ( !isVisible ) { + $( this ).show(); + } maxHeight = Math.max( maxHeight, $( this ).css( "height", "" ).height() ); + if ( !isVisible ) { + $( this ).hide(); + } } ) .height( maxHeight ); }