From 4b017b414f107ed3c1dafc7601b61cbcd76acf61 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 2 Mar 2015 18:43:07 -0500
Subject: Accordion: Handle `box-sizing: border-box` in animations

Fixes #9264
Closes gh-1287
Closes gh-1459
---
 ui/accordion.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/accordion.js b/ui/accordion.js
index cf53e9839..68a4c34ec 100644
--- a/ui/accordion.js
+++ b/ui/accordion.js
@@ -524,6 +524,7 @@ return $.widget( "ui.accordion", {
 		var total, easing, duration,
 			that = this,
 			adjust = 0,
+			boxSizing = toShow.css( "box-sizing" ),
 			down = toShow.length &&
 				( !toHide.length || ( toShow.index() < toHide.index() ) ),
 			animate = this.options.animate || {},
@@ -566,7 +567,9 @@ return $.widget( "ui.accordion", {
 				step: function( now, fx ) {
 					fx.now = Math.round( now );
 					if ( fx.prop !== "height" ) {
-						adjust += fx.now;
+						if ( boxSizing === "content-box" ) {
+							adjust += fx.now;
+						}
 					} else if ( that.options.heightStyle !== "content" ) {
 						fx.now = Math.round( total - toHide.outerHeight() - adjust );
 						adjust = 0;
-- 
cgit v1.2.3