Merge pull request #1338 from knoxHuang/v1.3

add hasEventListener for CCEventDispatcher
This commit is contained in:
Wang Nan
2016-12-06 16:52:52 +08:00
committed by GitHub
3 changed files with 14 additions and 5 deletions
@@ -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
* <p>
+2 -4
View File
@@ -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);
}
}
+1 -1
View File
@@ -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);