diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2012-04-23 16:33:34 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2012-04-23 16:33:34 -0400 |
| commit | 0f575e03bb9af0b09d18a9207d9f589e05f44d50 (patch) | |
| tree | 18251a2d3e7c51adb8f265158ca0361f5cca73d1 /ui/jquery.effects.core.js | |
| parent | af1576280a807dcc166ddf619abab1fc24cac664 (diff) | |
| parent | 9df981d268b4029065247cf230a4e988946b7799 (diff) | |
| download | jquery-ui-0f575e03bb9af0b09d18a9207d9f589e05f44d50.tar.gz jquery-ui-0f575e03bb9af0b09d18a9207d9f589e05f44d50.zip | |
Merge branch 'master' into position-notification
Conflicts:
tests/unit/position/position_core_within.js
Diffstat (limited to 'ui/jquery.effects.core.js')
| -rw-r--r-- | ui/jquery.effects.core.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js index 626ab1a89..bac060067 100644 --- a/ui/jquery.effects.core.js +++ b/ui/jquery.effects.core.js @@ -722,7 +722,7 @@ $.each( baseEasings, function( name, easeIn ) { $.easing[ "easeInOut" + name ] = function( p ) { return p < 0.5 ? easeIn( p * 2 ) / 2 : - easeIn( p * -2 + 2 ) / -2 + 1; + 1 - easeIn( p * -2 + 2 ) / 2; }; }); |