From 2c50b1b8b58bc7ca6a965e4deff480a1c733766b Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 1 Oct 2012 16:52:54 -0400
Subject: Accordion: Only adjust height animations for heightStyle: content.
 Fix tests that punch .animate().

---
 ui/jquery.ui.accordion.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui')

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;
 					}
-- 
cgit v1.2.3