Merge branch 'master' of github.com:ericdrowell/KineticJS

This commit is contained in:
Eric Rowell
2013-04-02 22:08:15 -07:00

View File

@@ -14,10 +14,10 @@
Kinetic.Transition = function(node, config) { Kinetic.Transition = function(node, config) {
var that = this, var that = this,
easing = config.easing || 'linear', easing = config.easing || 'linear',
easingFunc = Kinetic.Tweens[easing]; easingFunc = Kinetic.Tweens[easing],
duration = config.duration || 0, duration = config.duration || 0,
configVal = null, configVal = null,
lastTweenIndex = 0; lastTweenIndex = 0,
obj = {}, obj = {},
x = 0, x = 0,
y = 0; y = 0;