diff --git a/cocos2d/core/event-manager/CCEventManager.js b/cocos2d/core/event-manager/CCEventManager.js index 871cb52d05..f75f08542e 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); + }, + /** * !#en *
diff --git a/cocos2d/core/event-manager/CCSystemEvent.js b/cocos2d/core/event-manager/CCSystemEvent.js index 546ab5c056..a0ab1f4ee4 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._EventListenerKeyboard.LISTENER_ID)) { 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._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);