diff options
| author | gnarf <gnarf@gnarf.net> | 2011-05-10 16:16:34 -0500 |
|---|---|---|
| committer | gnarf <gnarf@gnarf.net> | 2011-05-10 16:16:34 -0500 |
| commit | 27a7deebf299e1673e8b452476be02e486bba2c6 (patch) | |
| tree | 79521a78ab770ebd7ee167575b680f14d3ed4089 /ui/jquery.effects.bounce.js | |
| parent | 4dcfeee8d54d81db4d5af8b2fd189b799cd9561e (diff) | |
| parent | 85ac420a1e4281ee7f361e847d3cad72fa58525e (diff) | |
| download | jquery-ui-27a7deebf299e1673e8b452476be02e486bba2c6.tar.gz jquery-ui-27a7deebf299e1673e8b452476be02e486bba2c6.zip | |
Merge branch 'master' into effects-unit
Conflicts:
ui/jquery.effects.pulsate.js
Diffstat (limited to 'ui/jquery.effects.bounce.js')
| -rw-r--r-- | ui/jquery.effects.bounce.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/jquery.effects.bounce.js b/ui/jquery.effects.bounce.js index 1ffd5ed5a..bb386a4f4 100644 --- a/ui/jquery.effects.bounce.js +++ b/ui/jquery.effects.bounce.js @@ -23,7 +23,7 @@ $.effects.effect.bounce = function(o) { hide = mode === "hide", show = mode === "show", direction = o.direction || "up", - distance = o.distance || 20, + distance = o.distance, times = o.times || 5, // number of internal animations @@ -53,7 +53,7 @@ $.effects.effect.bounce = function(o) { // default distance for the BIGGEST bounce is the outer Distance / 3 if ( !distance ) { - distance = el[ ref === "top" ? "outerHeight" : "outerWidth" ]({ margin:true }) / 3; + distance = el[ ref === "top" ? "outerHeight" : "outerWidth" ]() / 3; } if ( show ) { @@ -69,7 +69,7 @@ $.effects.effect.bounce = function(o) { // start at the smallest distance if we are hiding if ( hide ) { - distance = distance / ( ( times - 1 ) * 2 ); + distance = distance / Math.pow( 2, times - 1 ); } downAnim = {}; |