aboutsummaryrefslogtreecommitdiffstats
path: root/src/effects
diff options
context:
space:
mode:
authorTimmy Willison <timmywillisn@gmail.com>2015-05-05 10:24:20 -0700
committerTimmy Willison <timmywillisn@gmail.com>2015-05-05 10:26:02 -0700
commitb7f9e62642f4534329bf473861c7737669b1e8c4 (patch)
treed47b155c5ff08a00c21241e76f88cff582d17688 /src/effects
parentd6933917d217321e3d505abe201f3bf5bf7c3d66 (diff)
downloadjquery-b7f9e62642f4534329bf473861c7737669b1e8c4.tar.gz
jquery-b7f9e62642f4534329bf473861c7737669b1e8c4.zip
Effects: set default easing using jQuery.easing._default
Fixes gh-2219 Close gh-2218
Diffstat (limited to 'src/effects')
-rw-r--r--src/effects/Tween.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/effects/Tween.js b/src/effects/Tween.js
index 40a02659e..810d11133 100644
--- a/src/effects/Tween.js
+++ b/src/effects/Tween.js
@@ -13,7 +13,7 @@ Tween.prototype = {
init: function( elem, options, prop, end, easing, unit ) {
this.elem = elem;
this.prop = prop;
- this.easing = easing || "swing";
+ this.easing = easing || jQuery.easing._default;
this.options = options;
this.start = this.now = this.cur();
this.end = end;
@@ -105,7 +105,8 @@ jQuery.easing = {
},
swing: function( p ) {
return 0.5 - Math.cos( p * Math.PI ) / 2;
- }
+ },
+ _default: "swing"
};
jQuery.fx = Tween.prototype.init;