diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-05-18 17:12:52 +0200 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-05-18 17:12:52 +0200 |
| commit | ba6dd5c1805c44998baf3413c7cd37cce9416c96 (patch) | |
| tree | d3e1c8cdb022d76ba7fd99a85424647af9a1c536 /ui/jquery.ui.accordion.js | |
| parent | 1c193085e1f6cb17319f59fc3e812c4963a82bcc (diff) | |
| parent | 4ff8d90a825f8335a4dbc8df2539fa08a3fe0add (diff) | |
| download | jquery-ui-ba6dd5c1805c44998baf3413c7cd37cce9416c96.tar.gz jquery-ui-ba6dd5c1805c44998baf3413c7cd37cce9416c96.zip | |
Merge branch 'master' of github.com:jquery/jquery-ui
Diffstat (limited to 'ui/jquery.ui.accordion.js')
| -rw-r--r-- | ui/jquery.ui.accordion.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js index 0cc1f9e2a..c6b33befb 100644 --- a/ui/jquery.ui.accordion.js +++ b/ui/jquery.ui.accordion.js @@ -486,9 +486,11 @@ $.extend( $.ui.accordion, { $.each( fxAttrs, function( i, prop ) { hideProps[ prop ] = "hide"; - var parts = ( "" + $.css( options.toShow[0], prop ) ).match( /^([\d+-.]+)(.*)$/ ); + var parts = ( "" + $.css( options.toShow[0], prop ) ).match( /^([\d+-.]+)(.*)$/ ), + // work around bug when a panel has no height - #7335 + propVal = prop === "height" && parts[ 1 ] === "0" ? 1 : parts[ 1 ]; showProps[ prop ] = { - value: parts[ 1 ], + value: propVal, unit: parts[ 2 ] || "px" }; }); |