Skip to content

Commit

Permalink
Merge pull request #2351 from dumganhar/v1.8-release
Browse files Browse the repository at this point in the history
Fixed that we forget to observe onTouchCancelled event.
  • Loading branch information
pandamicro committed Feb 24, 2018
2 parents 191b80c + b8d7dc0 commit c30a431
Showing 1 changed file with 19 additions and 1 deletion.
20 changes: 19 additions & 1 deletion cocos2d/core/CCNode.js
Expand Up @@ -204,6 +204,23 @@ var _touchEndHandler = function (touch, event) {
Event.EventTouch.pool.put(event);
}
};
var _touchCancelHandler = function (touch, event) {
if (CC_JSB) {
event = Event.EventTouch.pool.get(event);
}
var pos = touch.getLocation();
var node = this.owner;

event.type = EventType.TOUCH_CANCEL;
event.touch = touch;
event.bubbles = true;
node.dispatchEvent(event);
if (CC_JSB) {
event.touch = null;
event._touches = null;
Event.EventTouch.pool.put(event);
}
};

var _mouseDownHandler = function (event) {
var pos = event.getLocation();
Expand Down Expand Up @@ -1191,7 +1208,8 @@ var Node = cc.Class({
mask: _searchMaskInParent(this),
onTouchBegan: _touchStartHandler,
onTouchMoved: _touchMoveHandler,
onTouchEnded: _touchEndHandler
onTouchEnded: _touchEndHandler,
onTouchCancelled: _touchCancelHandler
});
if (CC_JSB) {
this._touchListener.retain();
Expand Down

0 comments on commit c30a431

Please sign in to comment.