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 | |
| 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().
| -rw-r--r-- | tests/unit/accordion/accordion_options.js | 36 | ||||
| -rw-r--r-- | ui/jquery.ui.accordion.js | 4 |
2 files changed, 20 insertions, 20 deletions
diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js index 2b8222f5c..5d950e1ac 100644 --- a/tests/unit/accordion/accordion_options.js +++ b/tests/unit/accordion/accordion_options.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 ); }; 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; } |