From 17624dc5debea478f02cb018d8f956e022bf9c25 Mon Sep 17 00:00:00 2001
From: pandamicro <lphuabin@gmail.com>
Date: Tue, 4 Nov 2014 12:49:08 +0800
Subject: [PATCH] Fixed #2433: Fix ArmatureAnimation's setMovementEventCallFunc
 and setFrameEventCallFunc

---
 .../cocostudio/armature/animation/CCArmatureAnimation.js      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/cocostudio/armature/animation/CCArmatureAnimation.js b/extensions/cocostudio/armature/animation/CCArmatureAnimation.js
index 1f16082011..42ea8b5d9d 100644
--- 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._frameEventListener = target;
+            this._frameEventListener = 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._frameEventListener = target;
+            this._frameEventListener = callFunc;
         }else if(arguments.length == 2){
             this._frameEventTarget = target;
             this._frameEventCallFunc = callFunc;