diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2012-03-14 13:42:48 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2012-03-14 13:42:48 -0400 |
| commit | 682a321d1e4b80835a860f82fb686cff4943982b (patch) | |
| tree | 6f49b28f40fb952977cdfbccb80dd553640dea4b /ui/jquery.effects.core.js | |
| parent | 94f85149db2a8b2540f9b204c14d57d8b087fbf6 (diff) | |
| parent | ec062c1156d58726dc212e6e2191ee7196302c44 (diff) | |
| download | jquery-ui-682a321d1e4b80835a860f82fb686cff4943982b.tar.gz jquery-ui-682a321d1e4b80835a860f82fb686cff4943982b.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.effects.core.js')
| -rw-r--r-- | ui/jquery.effects.core.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js index b28e4c4ee..24df7178c 100644 --- a/ui/jquery.effects.core.js +++ b/ui/jquery.effects.core.js @@ -1,7 +1,7 @@ /* * jQuery UI Effects @VERSION * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license * @@ -159,7 +159,7 @@ var classAnimationActions = [ "add", "remove", "toggle" ], padding: 1 }, // prefix used for storing data on .data() - dataSpace = "ec.storage."; + dataSpace = "ui-effects-"; $.each([ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ], function( _, prop ) { $.fx.step[ prop ] = function( fx ) { @@ -689,7 +689,7 @@ $.extend( baseEasings, { Bounce: function ( p ) { var pow2, bounce = 4; - + while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {} return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 ); } |