Skip to content
Permalink
Browse files

Accordion: Only adjust height animations for heightStyle: content. Fi…

…x tests that punch .animate().
  • Loading branch information...
scottgonzalez committed Oct 1, 2012
1 parent d20f05e commit 2c50b1b8b58bc7ca6a965e4deff480a1c733766b
Showing with 20 additions and 20 deletions.
  1. +18 −18 tests/unit/accordion/accordion_options.js
  2. +2 −2 ui/jquery.ui.accordion.js
@@ -105,9 +105,9 @@ asyncTest( "{ animate: Number }", function() {
panels = element.find( ".ui-accordion-content" ),
animate = $.fn.animate;
// called twice (both panels)
$.fn.animate = function( props, duration, easing ) {
equal( duration, 100, "correct duration" );
equal( easing, undefined, "default easing" );
$.fn.animate = function( props, options ) {
equal( options.duration, 100, "correct duration" );
equal( options.easing, undefined, "default easing" );
animate.apply( this, arguments );
};

@@ -129,9 +129,9 @@ asyncTest( "{ animate: String }", function() {
panels = element.find( ".ui-accordion-content" ),
animate = $.fn.animate;
// called twice (both panels)
$.fn.animate = function( props, duration, easing ) {
equal( duration, undefined, "default duration" );
equal( easing, "linear", "correct easing" );
$.fn.animate = function( props, options ) {
equal( options.duration, undefined, "default duration" );
equal( options.easing, "linear", "correct easing" );
animate.apply( this, arguments );
};

@@ -153,9 +153,9 @@ asyncTest( "{ animate: {} }", function() {
panels = element.find( ".ui-accordion-content" ),
animate = $.fn.animate;
// called twice (both panels)
$.fn.animate = function( props, duration, easing ) {
equal( duration, undefined, "default duration" );
equal( easing, undefined, "default easing" );
$.fn.animate = function( props, options ) {
equal( options.duration, undefined, "default duration" );
equal( options.easing, undefined, "default easing" );
animate.apply( this, arguments );
};

@@ -177,9 +177,9 @@ asyncTest( "{ animate: { duration, easing } }", function() {
panels = element.find( ".ui-accordion-content" ),
animate = $.fn.animate;
// called twice (both panels)
$.fn.animate = function( props, duration, easing ) {
equal( duration, 100, "correct duration" );
equal( easing, "linear", "correct easing" );
$.fn.animate = function( props, options ) {
equal( options.duration, 100, "correct duration" );
equal( options.easing, "linear", "correct easing" );
animate.apply( this, arguments );
};

@@ -202,9 +202,9 @@ asyncTest( "{ animate: { duration, easing } }, animate down", function() {
panels = element.find( ".ui-accordion-content" ),
animate = $.fn.animate;
// called twice (both panels)
$.fn.animate = function( props, duration, easing ) {
equal( duration, 100, "correct duration" );
equal( easing, "linear", "correct easing" );
$.fn.animate = function( props, options ) {
equal( options.duration, 100, "correct duration" );
equal( options.easing, "linear", "correct easing" );
animate.apply( this, arguments );
};

@@ -233,9 +233,9 @@ asyncTest( "{ animate: { duration, easing, down } }, animate down", function() {
panels = element.find( ".ui-accordion-content" ),
animate = $.fn.animate;
// called twice (both panels)
$.fn.animate = function( props, duration, easing ) {
equal( duration, 100, "correct duration" );
equal( easing, "swing", "correct easing" );
$.fn.animate = function( props, options ) {
equal( options.duration, 100, "correct duration" );
equal( options.easing, "swing", "correct easing" );
animate.apply( this, arguments );
};

@@ -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;
}

0 comments on commit 2c50b1b

Please sign in to comment.
You can’t perform that action at this time.