diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2012-10-01 16:52:54 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2012-10-01 16:52:54 -0400 |
| commit | 2c50b1b8b58bc7ca6a965e4deff480a1c733766b (patch) | |
| tree | c1eb8f78433bbd8f89435c842f0eff991466e997 /ui | |
| parent | d20f05ea37f17ec7799fb4d989c2ecba8689b096 (diff) | |
| download | jquery-ui-2c50b1b8b58bc7ca6a965e4deff480a1c733766b.tar.gz jquery-ui-2c50b1b8b58bc7ca6a965e4deff480a1c733766b.zip | |
Accordion: Only adjust height animations for heightStyle: content. Fix tests that punch .animate().
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/jquery.ui.accordion.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js index bc3cbfcc6..48e880a05 100644 --- a/ui/jquery.ui.accordion.js +++ b/ui/jquery.ui.accordion.js @@ -518,10 +518,10 @@ $.widget( "ui.accordion", { easing: easing, complete: complete, step: function( now, fx ) { + fx.now = Math.round( now ); if ( fx.prop !== "height" ) { - fx.now = Math.round( now ); adjust += fx.now; - } else { + } else if ( that.options.heightStyle !== "content" ) { fx.now = Math.round( total - toHide.outerHeight() - adjust ); adjust = 0; } |