From cb94f9a68384a2d0f5c2db92bd1e4c56c7afd2c0 Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Tue, 6 Dec 2016 14:26:48 +0800 Subject: [PATCH 1/2] add hasEventListener for CCEventDispatcher --- cocos2d/core/event-manager/CCEventManager.js | 11 +++++++++++ cocos2d/core/event-manager/CCSystemEvent.js | 6 ++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/cocos2d/core/event-manager/CCEventManager.js b/cocos2d/core/event-manager/CCEventManager.js index 871cb52d05..972f43afa6 100644 --- a/cocos2d/core/event-manager/CCEventManager.js +++ b/cocos2d/core/event-manager/CCEventManager.js @@ -695,6 +695,17 @@ cc.eventManager = { return a - b; }, + /** + * !#en Query whether the specified event listener id has been added. + * !#zh 查询指定的事件 ID 是否存在 + * @method hasEventListener + * @param {String|Number} listenerID - The listener id. + * @return {Boolean} true or false + */ + hasEventListener: function (listenerID) { + return this._getListeners(listenerID) ? true : false; + }, + /** * !#en *

diff --git a/cocos2d/core/event-manager/CCSystemEvent.js b/cocos2d/core/event-manager/CCSystemEvent.js index 546ab5c056..363c1f7e76 100644 --- a/cocos2d/core/event-manager/CCSystemEvent.js +++ b/cocos2d/core/event-manager/CCSystemEvent.js @@ -103,8 +103,7 @@ var SystemEvent = cc.Class({ } }); } - var hasKeyboardListener = cc.eventManager._getListeners(keyboardListener._listenerID); - if (!hasKeyboardListener) { + if (!cc.eventManager.hasEventListener('__cc_keyboard')) { cc.eventManager.addListener(keyboardListener, 1); } } @@ -128,8 +127,7 @@ var SystemEvent = cc.Class({ } }); } - var hasAccelerationListener = cc.eventManager._getListeners(accelerationListener._listenerID); - if (!hasAccelerationListener) { + if (!cc.eventManager.hasEventListener('__cc_acceleration')) { cc.eventManager.addListener(accelerationListener, 1); } } From 55cfa7f7fbe835613ce4fac7111549acdd1fd6de Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Tue, 6 Dec 2016 16:30:13 +0800 Subject: [PATCH 2/2] update hasEventListener for CCEventDispatcher --- cocos2d/core/event-manager/CCEventManager.js | 2 +- cocos2d/core/event-manager/CCSystemEvent.js | 4 ++-- cocos2d/core/utils/base-node.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cocos2d/core/event-manager/CCEventManager.js b/cocos2d/core/event-manager/CCEventManager.js index 972f43afa6..f75f08542e 100644 --- a/cocos2d/core/event-manager/CCEventManager.js +++ b/cocos2d/core/event-manager/CCEventManager.js @@ -703,7 +703,7 @@ cc.eventManager = { * @return {Boolean} true or false */ hasEventListener: function (listenerID) { - return this._getListeners(listenerID) ? true : false; + return !!this._getListeners(listenerID); }, /** diff --git a/cocos2d/core/event-manager/CCSystemEvent.js b/cocos2d/core/event-manager/CCSystemEvent.js index 363c1f7e76..a0ab1f4ee4 100644 --- a/cocos2d/core/event-manager/CCSystemEvent.js +++ b/cocos2d/core/event-manager/CCSystemEvent.js @@ -103,7 +103,7 @@ var SystemEvent = cc.Class({ } }); } - if (!cc.eventManager.hasEventListener('__cc_keyboard')) { + if (!cc.eventManager.hasEventListener(cc._EventListenerKeyboard.LISTENER_ID)) { cc.eventManager.addListener(keyboardListener, 1); } } @@ -127,7 +127,7 @@ var SystemEvent = cc.Class({ } }); } - if (!cc.eventManager.hasEventListener('__cc_acceleration')) { + if (!cc.eventManager.hasEventListener(cc._EventListenerAcceleration.LISTENER_ID)) { cc.eventManager.addListener(accelerationListener, 1); } } diff --git a/cocos2d/core/utils/base-node.js b/cocos2d/core/utils/base-node.js index 584941f7c7..5adbf65aee 100644 --- a/cocos2d/core/utils/base-node.js +++ b/cocos2d/core/utils/base-node.js @@ -792,12 +792,12 @@ var BaseNode = cc.Class(/** @lends cc.Node# */{ }, _onPreDestroy: function () { + cc.eventManager.removeListeners(this); if (CC_JSB) { this._sgNode.release(); this._sgNode._entity = null; this._sgNode = null; } - cc.eventManager.removeListeners(this); for (var i = 0, len = this.__eventTargets.length; i < len; ++i) { var target = this.__eventTargets[i]; target && target.targetOff(this);