From edbea7e688c751953cd391fd61f6384d8ea22f97 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Tue, 24 May 2016 18:11:37 +0800 Subject: [PATCH 1/2] Fix event listener's target update invoked on invalid object issue --- cocos2d/core/event/event-listeners.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cocos2d/core/event/event-listeners.js b/cocos2d/core/event/event-listeners.js index 43990bf9fb..d341aaba75 100644 --- a/cocos2d/core/event/event-listeners.js +++ b/cocos2d/core/event/event-listeners.js @@ -46,14 +46,18 @@ EventListeners.prototype.invoke = function (event) { if (list) { if (list.length === 1) { callingFunc = list[0]; - callingFunc.call && callingFunc.call(event.currentTarget, event); + if (callingFunc.call) { + callingFunc.call(event.currentTarget, event); + } } else { endIndex = list.length - 1; if (key === cc.Director.EVENT_COMPONENT_UPDATE) { for (i = 1; i <= endIndex; i += 2) { target = list[i]; - target.update(event.detail); + if (target.update) { + target.update(event.detail); + } } } else { From 09c7a9e76d7f2aea1870f5e70996ff4b62ee19c9 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Wed, 25 May 2016 10:40:12 +0800 Subject: [PATCH 2/2] Callbacks handler: use REMOVE_PLACEHOLDER directly to detect --- cocos2d/core/event/event-listeners.js | 8 +++++--- cocos2d/core/platform/callbacks-invoker.js | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cocos2d/core/event/event-listeners.js b/cocos2d/core/event/event-listeners.js index d341aaba75..85abe94cf3 100644 --- a/cocos2d/core/event/event-listeners.js +++ b/cocos2d/core/event/event-listeners.js @@ -26,6 +26,8 @@ var JS = cc.js; var CallbacksHandler = require('../platform/callbacks-invoker').CallbacksHandler; +var REMOVE_PLACEHOLDER = CallbacksHandler.REMOVE_PLACEHOLDER; + // Extends CallbacksHandler to handle and invoke event callbacks. function EventListeners () { CallbacksHandler.call(this); @@ -46,7 +48,7 @@ EventListeners.prototype.invoke = function (event) { if (list) { if (list.length === 1) { callingFunc = list[0]; - if (callingFunc.call) { + if (callingFunc !== REMOVE_PLACEHOLDER) { callingFunc.call(event.currentTarget, event); } } @@ -55,7 +57,7 @@ EventListeners.prototype.invoke = function (event) { if (key === cc.Director.EVENT_COMPONENT_UPDATE) { for (i = 1; i <= endIndex; i += 2) { target = list[i]; - if (target.update) { + if (target !== REMOVE_PLACEHOLDER) { target.update(event.detail); } } @@ -65,7 +67,7 @@ EventListeners.prototype.invoke = function (event) { callingFunc = list[i]; var increment = 1; // cheap detection for function - if (callingFunc.call) { + if (callingFunc !== REMOVE_PLACEHOLDER) { target = list[i+1]; hasTarget = target && typeof target === 'object'; if (hasTarget) { diff --git a/cocos2d/core/platform/callbacks-invoker.js b/cocos2d/core/platform/callbacks-invoker.js index 6dee94e9a2..00e03585e2 100644 --- a/cocos2d/core/platform/callbacks-invoker.js +++ b/cocos2d/core/platform/callbacks-invoker.js @@ -38,6 +38,7 @@ var CallbacksHandler = (function () { // Avoid to equal to user set target (null for example) var REMOVE_PLACEHOLDER = Number.POSITIVE_INFINITY; +CallbacksHandler.REMOVE_PLACEHOLDER = REMOVE_PLACEHOLDER; CallbacksHandler.prototype._clearToRemove = function (key) { var list = this._callbackTable[key]; @@ -238,7 +239,7 @@ CallbacksInvoker.prototype.invoke = function (key, p1, p2, p3, p4, p5) { var callingFunc = list[i]; var increment = 1; // cheap detection for function - if (callingFunc.call) { + if (callingFunc !== REMOVE_PLACEHOLDER) { var target = list[i + 1]; var hasTarget = target && typeof target === 'object'; if (hasTarget) { @@ -278,7 +279,7 @@ CallbacksInvoker.prototype.invokeAndRemove = function (key, p1, p2, p3, p4, p5) callingFunc = list[i]; increment = 1; // cheap detection for function - if (callingFunc.call) { + if (callingFunc !== REMOVE_PLACEHOLDER) { target = list[i+1]; if (target && typeof target === 'object') { callingFunc.call(target, p1, p2, p3, p4, p5);