Merge pull request cocos2d#1560 from ShengxiangChen/issue_callback

extraction public function

Author: dingpinglv

cocos2d/CCNotificationCenter.js

@@ -143,13 +143,7 @@ cc.NotificationObserver = cc.Class.extend({
      * @param {cc.Class} obj
      */
     performSelector:function (obj) {
-        if (this._target && (typeof(this._selector) == "string")) {
-            this._target[this._selector](obj);
-        } else if (this._target && (typeof(this._selector) == "function")) {
-            this._selector.call(this._target, obj);
-        } else {
-            this._selector(obj);
-        }
+        cc.doCallback(this._selector, this._target,obj);
     },
 
     _target:null,

cocos2d/actions/CCActionInstant.js

@@ -399,10 +399,7 @@ cc.CallFunc = cc.ActionInstant.extend(/** @lends cc.CallFunc# */{
      * execute the function.
      */
     execute:function () {
-        if (this._callFunc != null)         //CallFunc, N, ND
-            this._callFunc.call(this._selectorTarget, this._target, this._data);
-        else if(this._function)
-            this._function.call(null, this._target);
+        cc.doCallback(this._callFunc, this._selectorTarget,this._data);
     },
 
     /**

cocos2d/core/CCLoader.js

@@ -270,13 +270,7 @@ cc.Loader = cc.Class.extend(/** @lends cc.Loader# */{
     },
 
     _complete: function () {
-        if (this._target && (typeof(this._selector) == "string")) {
-            this._target[this._selector](this);
-        } else if (this._target && (typeof(this._selector) == "function")) {
-            this._selector.call(this._target, this);
-        } else {
-            this._selector(this);
-        }
+        cc.doCallback(this._selector, this._target);
 
         this._curNumber = 0;
         this._loadedNumber = 0;

cocos2d/core/CCScheduler.js

@@ -316,10 +316,7 @@ cc.Timer = cc.Class.extend(/** @lends cc.Timer# */{
     },
 
     _callSelector:function(){
-        if (typeof(this._selector) == "string")
-            this._target[this._selector](this._elapsed);
-         else // if (typeof(this._selector) == "function") {
-            this._selector.call(this._target, this._elapsed);
+        cc.doCallback(this._selector, this._target,this._elapsed);
     },
 
     /**

cocos2d/core/platform/CCCommon.js

@@ -554,4 +554,22 @@ cc.SizeFromString = function (content) {
 	var result = CCNS_REG1.exec(content);
 	if(!result) return cc.SizeZero();
 	return cc.size(parseFloat(result[1]), parseFloat(result[2]));
+};
+
+/**
+ *
+ * @param {Function} selector
+ * @param {cc.Node} target
+ * @param {Object|Number|String} data
+ */
+cc.doCallback = function (selector, target, data) {
+    if(!selector)
+        return ;
+    if (target && (typeof(selector) == "string")) {
+        target[selector](data);
+    } else if (target && (typeof(selector) == "function")) {
+        selector.call(target, data);
+    } else {
+        selector(data);
+    }
 };

cocos2d/core/sprite_nodes/CCSprite.js

@@ -350,7 +350,7 @@ cc.Sprite = cc.NodeRGBA.extend(/** @lends cc.Sprite# */{
         var locListeners = this._loadedEventListeners;
         for(var i = 0, len = locListeners.length;  i < len; i++){
             var selCallback = locListeners[i];
-            selCallback.eventCallback.call(selCallback.eventTarget, this);
+            cc.doCallback(selCallback.eventCallback, selCallback.eventTarget, this);
         }
         locListeners.length = 0;
     },

cocos2d/core/sprite_nodes/CCSpriteFrame.js

@@ -80,7 +80,7 @@ cc.SpriteFrame = cc.Class.extend(/** @lends cc.SpriteFrame# */{
         if (!locListeners) return;
         for(var i = 0, len = locListeners.length;  i < len; i++){
             var selCallback = locListeners[i];
-            selCallback.eventCallback.call(selCallback.eventTarget, this);
+            cc.doCallback(selCallback.eventCallback, selCallback.eventTarget, this);
         }
         locListeners.length = 0;
     },

cocos2d/core/textures/CCTexture2D.js

@@ -932,7 +932,7 @@ cc.Texture2DWebGL = cc.Class.extend(/** @lends cc.Texture2D# */{
         var locListeners = this._loadedEventListeners;
         for (var i = 0, len = locListeners.length; i < len; i++) {
             var selCallback = locListeners[i];
-            selCallback.eventCallback.call(selCallback.eventTarget, this);
+            cc.doCallback(selCallback.eventCallback, selCallback.eventTarget, this);
         }
         locListeners.length = 0;
     }
@@ -1284,7 +1284,7 @@ cc.Texture2DCanvas = cc.Class.extend(/** @lends cc.Texture2D# */{
         var locListeners = this._loadedEventListeners;
         for(var i = 0, len = locListeners.length;  i < len; i++){
             var selCallback = locListeners[i];
-            selCallback.eventCallback.call(selCallback.eventTarget, this);
+            cc.doCallback(selCallback.eventCallback, selCallback.eventTarget, this);
         }
         locListeners.length = 0;
     }

cocos2d/core/textures/CCTextureCache.js

@@ -97,11 +97,7 @@ cc.TextureCache = cc.Class.extend(/** @lends cc.TextureCache# */{
     },
 
     _addImageAsyncCallBack:function (target, selector) {
-        if (target && (typeof(selector) === "string")) {
-            target[selector]();
-        } else if (target && (typeof(selector) === "function")) {
-            selector.call(target);
-        }
+        cc.doCallback(selector, target);
     },
 
     _initializingRenderer : function(){

cocos2d/label_nodes/CCLabelAtlas.js

@@ -68,7 +68,7 @@ cc.LabelAtlas = cc.AtlasNode.extend(/** @lends cc.LabelAtlas# */{
         var locListeners = this._loadedEventListeners;
         for(var i = 0, len = locListeners.length;  i < len; i++){
             var selCallback = locListeners[i];
-            selCallback.eventCallback.call(selCallback.eventTarget, this);
+            cc.doCallback(selCallback.eventCallback, selCallback.eventTarget, this);
         }
         locListeners.length = 0;
     },

cocos2d/label_nodes/CCLabelBMFont.js

@@ -522,7 +522,7 @@ cc.LabelBMFont = cc.SpriteBatchNode.extend(/** @lends cc.LabelBMFont# */{
         var locListeners = this._loadedEventListeners;
         for(var i = 0, len = locListeners.length;  i < len; i++){
             var selCallback = locListeners[i];
-            selCallback.eventCallback.call(selCallback.eventTarget, this);
+            cc.doCallback(selCallback.eventCallback, selCallback.eventTarget, this); 
         }
         locListeners.length = 0;
     },

cocos2d/menu_nodes/CCMenuItem.js

@@ -184,15 +184,7 @@ cc.MenuItem = cc.NodeRGBA.extend(/** @lends cc.MenuItem# */{
      */
     activate:function () {
         if (this._isEnabled) {
-            var locTarget = this._target, locCallback = this._callback;
-            if(!locCallback)
-                return ;
-            if (locTarget && (typeof(locCallback) == "string")) {
-                locTarget[locCallback](this);
-            } else if (locTarget && (typeof(locCallback) == "function")) {
-                locCallback.call(locTarget, this);
-            } else
-                locCallback(this);
+            cc.doCallback(this._callback, this._target,this);
         }
     }
 });