Permalink
Browse files

Accordion: Handle `box-sizing: border-box` in animations

Fixes #9264
Closes gh-1287
Closes gh-1459
(cherry picked from commit 4b017b4)
  • Loading branch information...
scottgonzalez committed Mar 2, 2015
1 parent 04ab6e0 commit de75b40835ecb82360321dafbd87d66db5404a4a
Showing with 4 additions and 1 deletion.
  1. +4 −1 ui/accordion.js
View
@@ -516,6 +516,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 || {},
@@ -558,7 +559,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;

0 comments on commit de75b40

Please sign in to comment.