Merge pull request #2108 from cocos-creator/v1.7-release

Update V1.7
This commit is contained in:
Jare Guo
2017-11-13 02:45:52 -06:00
committed by GitHub
+7 -5
View File
@@ -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();