mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 16:12:40 +08:00
Merge pull request #722 from pandamicro/master
Fix target not verified issue in event-listeners
This commit is contained in:
@@ -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,14 +48,18 @@ EventListeners.prototype.invoke = function (event) {
|
||||
if (list) {
|
||||
if (list.length === 1) {
|
||||
callingFunc = list[0];
|
||||
callingFunc.call && callingFunc.call(event.currentTarget, event);
|
||||
if (callingFunc !== REMOVE_PLACEHOLDER) {
|
||||
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 !== REMOVE_PLACEHOLDER) {
|
||||
target.update(event.detail);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
@@ -61,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) {
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user