diff --git a/v3/src/tween/Tween.js b/v3/src/tween/Tween.js index 25bb1c43b..2e1521c9c 100644 --- a/v3/src/tween/Tween.js +++ b/v3/src/tween/Tween.js @@ -121,7 +121,7 @@ var Tween = new Class({ resetTweenData: require('./components/ResetTweenData'), resume: require('./components/Resume'), seek: require('./components/Seek'), - setEventCallback: require('./components/SetEventCallback'), + setCallback: require('./components/SetCallback'), stop: require('./components/Stop'), update: require('./components/Update') diff --git a/v3/src/tween/TweenBuilder.js b/v3/src/tween/TweenBuilder.js index f6a1c990a..a8129b41f 100644 --- a/v3/src/tween/TweenBuilder.js +++ b/v3/src/tween/TweenBuilder.js @@ -275,7 +275,7 @@ var TweenBuilder = function (manager, config) var onStartScope = GetValue(config, 'onStartScope', scope); var onStartParams = GetValue(config, 'onStartParams', []); - tween.setEventCallback('onStart', onStart, tweenArray.concat(onStartParams), onStartScope); + tween.setCallback('onStart', onStart, tweenArray.concat(onStartParams), onStartScope); } var onUpdate = GetValue(config, 'onUpdate', false); @@ -286,7 +286,7 @@ var TweenBuilder = function (manager, config) var onUpdateScope = GetValue(config, 'onUpdateScope', scope); var onUpdateParams = GetValue(config, 'onUpdateParams', []); - tween.setEventCallback('onUpdate', onUpdate, tweenArray.concat(onUpdateParams), onUpdateScope); + tween.setCallback('onUpdate', onUpdate, tweenArray.concat(onUpdateParams), onUpdateScope); } var onRepeat = GetValue(config, 'onRepeat', false); @@ -297,7 +297,7 @@ var TweenBuilder = function (manager, config) var onRepeatScope = GetValue(config, 'onRepeatScope', scope); var onRepeatParams = GetValue(config, 'onRepeatParams', []); - tween.setEventCallback('onRepeat', onRepeat, tweenArray.concat(null, onRepeatParams), onRepeatScope); + tween.setCallback('onRepeat', onRepeat, tweenArray.concat(null, onRepeatParams), onRepeatScope); } var onLoop = GetValue(config, 'onLoop', false); @@ -308,7 +308,7 @@ var TweenBuilder = function (manager, config) var onLoopScope = GetValue(config, 'onLoopScope', scope); var onLoopParams = GetValue(config, 'onLoopParams', []); - tween.setEventCallback('onLoop', onLoop, tweenArray.concat(onLoopParams), onLoopScope); + tween.setCallback('onLoop', onLoop, tweenArray.concat(onLoopParams), onLoopScope); } var onYoyo = GetValue(config, 'onYoyo', false); @@ -319,7 +319,7 @@ var TweenBuilder = function (manager, config) var onYoyoScope = GetValue(config, 'onYoyoScope', scope); var onYoyoParams = GetValue(config, 'onYoyoParams', []); - tween.setEventCallback('onYoyo', onYoyo, tweenArray.concat(null, onYoyoParams), onYoyoScope); + tween.setCallback('onYoyo', onYoyo, tweenArray.concat(null, onYoyoParams), onYoyoScope); } var onComplete = GetValue(config, 'onComplete', false); @@ -330,7 +330,7 @@ var TweenBuilder = function (manager, config) var onCompleteScope = GetValue(config, 'onCompleteScope', scope); var onCompleteParams = GetValue(config, 'onCompleteParams', []); - tween.setEventCallback('onComplete', onComplete, tweenArray.concat(onCompleteParams), onCompleteScope); + tween.setCallback('onComplete', onComplete, tweenArray.concat(onCompleteParams), onCompleteScope); } return tween; diff --git a/v3/src/tween/components/SetEventCallback.js b/v3/src/tween/components/SetCallback.js similarity index 71% rename from v3/src/tween/components/SetEventCallback.js rename to v3/src/tween/components/SetCallback.js index 7678f9ef0..ec879dcaa 100644 --- a/v3/src/tween/components/SetEventCallback.js +++ b/v3/src/tween/components/SetCallback.js @@ -1,4 +1,4 @@ -var SetEventCallback = function (type, callback, params, scope) +var SetCallback = function (type, callback, params, scope) { var types = [ 'onStart', 'onUpdate', 'onRepeat', 'onLoop', 'onComplete', 'onYoyo' ]; @@ -10,4 +10,4 @@ var SetEventCallback = function (type, callback, params, scope) return this; }; -module.exports = SetEventCallback; +module.exports = SetCallback;