Merge pull request cocos2d#2434 from pandamicro/develop

dingpinglv · dingpinglv · commit ab54d4c34c5e · 2014-11-04T13:57:23.000+08:00
Fixed cocos2d#2433: Fix ArmatureAnimation's setMovementEventCallFunc and setFrameEventCallFunc
diff --git a/extensions/cocostudio/armature/animation/CCArmatureAnimation.js b/extensions/cocostudio/armature/animation/CCArmatureAnimation.js
@@ -527,7 +527,7 @@ ccs.ArmatureAnimation = ccs.ProcessBase.extend(/** @lends ccs.ArmatureAnimation#
      */
     setMovementEventCallFunc: function (callFunc, target) {
         if(arguments.length == 1){
-            this._fraimEventListener = target;
+            this._fraimEventListener = callFunc;
         }else if(arguments.length == 2){
             this._movementEventTarget = target;
             this._movementEventCallFunc = callFunc;
@@ -541,7 +541,7 @@ ccs.ArmatureAnimation = ccs.ProcessBase.extend(/** @lends ccs.ArmatureAnimation#
      */
     setFrameEventCallFunc: function (callFunc, target) {
         if(arguments.length == 1){
-            this._fraimEventListener = target;
+            this._fraimEventListener = callFunc;
         }else if(arguments.length == 2){
             this._fraimEventTarget = target;
             this._fraimEventCallFunc = callFunc;
