From 0d996693015fcae0dc379acc753b64f2077a7e68 Mon Sep 17 00:00:00 2001 From: pandamicro Date: Wed, 1 Nov 2017 00:22:49 +0800 Subject: [PATCH 1/2] Fix scheduler isScheduled not recognize schedules by key --- jsb/jsb-etc.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/jsb/jsb-etc.js b/jsb/jsb-etc.js index 93dafcce0b..30d6ce1a18 100644 --- a/jsb/jsb-etc.js +++ b/jsb/jsb-etc.js @@ -91,6 +91,22 @@ cc.Scheduler.prototype.unschedule = function (callback, target) { var key = instanceId + '_' + callback.__callbackId; this._unschedule(key, target); }; +cc.Scheduler.prototype._isScheduled = cc.Scheduler.prototype.isScheduled; +cc.Scheduler.prototype.isScheduled = function (callback, target) { + if (typeof target === 'function') { + var tmp = target; + target = callback; + callback = tmp; + } + if (callback.__callbackId === undefined) { + return; + } + + var instanceId = target.__instanceId || target.uuid; + cc.assertID(instanceId !== undefined, 1510); + var key = instanceId + '_' + callback.__callbackId; + this._isScheduled(key, target); +}; // Node var nodeProto = cc.Node.prototype; From 35ab96373b3696e75e2a7f520aa0121c0297433b Mon Sep 17 00:00:00 2001 From: pandamicro Date: Sat, 4 Nov 2017 14:52:11 +0800 Subject: [PATCH 2/2] Add hit test for mouse up event --- cocos2d/core/CCNode.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cocos2d/core/CCNode.js b/cocos2d/core/CCNode.js index f345764f6a..fbc77b8cfc 100644 --- a/cocos2d/core/CCNode.js +++ b/cocos2d/core/CCNode.js @@ -239,12 +239,14 @@ var _mouseUpHandler = function (event) { var pos = event.getLocation(); var node = this.owner; - if (CC_JSB) { - event = Event.EventMouse.pool.get(event); + if (node._hitTest(pos, this)) { + if (CC_JSB) { + event = Event.EventMouse.pool.get(event); + } + event.type = EventType.MOUSE_UP; + event.bubbles = true; + node.dispatchEvent(event); } - event.type = EventType.MOUSE_UP; - event.bubbles = true; - node.dispatchEvent(event); }; var _mouseWheelHandler = function (event) { var pos = event.getLocation();