Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

fixed a bug of callfunc #1643

Merged
merged 1 commit into from

2 participants

@ShengxiangChen

No description provided.

@dingpinglv dingpinglv merged commit 630cc0a into cocos2d:develop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 7, 2014
  1. @ShengxiangChen
This page is out of date. Refresh to see the latest.
Showing with 4 additions and 1 deletion.
  1. +4 −1 cocos2d/actions/CCActionInstant.js
View
5 cocos2d/actions/CCActionInstant.js
@@ -399,7 +399,10 @@ cc.CallFunc = cc.ActionInstant.extend(/** @lends cc.CallFunc# */{
* execute the function.
*/
execute:function () {
- cc.doCallback(this._callFunc, this._selectorTarget,this._data);
+ if (this._callFunc != null)
+ this._callFunc.call(this._selectorTarget, this._target, this._data);
+ else if(this._function)
+ this._function.call(null, this._target);
},
/**
Something went wrong with that request. Please try again.