mirror of
https://github.com/konvajs/konva.git
synced 2025-06-28 15:23:44 +08:00
repair cancelBubble
event property behaviour. fix #123.
This commit is contained in:
parent
6643fe8d9b
commit
e3596d6c63
@ -4,6 +4,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
|||||||
|
|
||||||
## [Not released][Not released]
|
## [Not released][Not released]
|
||||||
|
|
||||||
|
## Fixed
|
||||||
|
- repair `cancelBubble` event property behaviour
|
||||||
|
|
||||||
## [0.11.1][2016-01-16]
|
## [0.11.1][2016-01-16]
|
||||||
|
|
||||||
|
4
konva.js
4
konva.js
@ -3,7 +3,7 @@
|
|||||||
* Konva JavaScript Framework v0.11.1
|
* Konva JavaScript Framework v0.11.1
|
||||||
* http://konvajs.github.io/
|
* http://konvajs.github.io/
|
||||||
* Licensed under the MIT or GPL Version 2 licenses.
|
* Licensed under the MIT or GPL Version 2 licenses.
|
||||||
* Date: Sat Jan 16 2016
|
* Date: Tue Jan 26 2016
|
||||||
*
|
*
|
||||||
* Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
|
* Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
|
||||||
* Modified work Copyright (C) 2014 - 2015 by Anton Lavrenov (Konva)
|
* Modified work Copyright (C) 2014 - 2015 by Anton Lavrenov (Konva)
|
||||||
@ -4022,7 +4022,7 @@
|
|||||||
var events = this.eventListeners[eventType],
|
var events = this.eventListeners[eventType],
|
||||||
i;
|
i;
|
||||||
|
|
||||||
evt = Konva.Util.cloneObject(evt || {});
|
evt = evt || {};
|
||||||
evt.currentTarget = this;
|
evt.currentTarget = this;
|
||||||
evt.type = eventType;
|
evt.type = eventType;
|
||||||
|
|
||||||
|
4
konva.min.js
vendored
4
konva.min.js
vendored
File diff suppressed because one or more lines are too long
@ -1785,7 +1785,7 @@
|
|||||||
var events = this.eventListeners[eventType],
|
var events = this.eventListeners[eventType],
|
||||||
i;
|
i;
|
||||||
|
|
||||||
evt = Konva.Util.cloneObject(evt || {});
|
evt = evt || {};
|
||||||
evt.currentTarget = this;
|
evt.currentTarget = this;
|
||||||
evt.type = eventType;
|
evt.type = eventType;
|
||||||
|
|
||||||
|
@ -1609,7 +1609,7 @@ suite('Node', function() {
|
|||||||
name: 'rectName',
|
name: 'rectName',
|
||||||
id: 'rectId'
|
id: 'rectId'
|
||||||
});
|
});
|
||||||
|
|
||||||
group.add(rect);
|
group.add(rect);
|
||||||
layer.add(group);
|
layer.add(group);
|
||||||
stage.add(layer);
|
stage.add(layer);
|
||||||
@ -1910,6 +1910,41 @@ suite('Node', function() {
|
|||||||
assert.equal(clicks[1], 'layer');
|
assert.equal(clicks[1], 'layer');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// ======================================================
|
||||||
|
test('simulate cancel event bubble', function() {
|
||||||
|
var stage = addStage();
|
||||||
|
var layer = new Konva.Layer();
|
||||||
|
var circle = new Konva.Circle({
|
||||||
|
x: stage.getWidth() / 2,
|
||||||
|
y: stage.getHeight() / 2,
|
||||||
|
radius: 70,
|
||||||
|
fill: 'green',
|
||||||
|
stroke: 'black',
|
||||||
|
strokeWidth: 4,
|
||||||
|
name: 'myCircle'
|
||||||
|
});
|
||||||
|
|
||||||
|
stage.add(layer);
|
||||||
|
layer.add(circle);
|
||||||
|
layer.draw();
|
||||||
|
|
||||||
|
var clicks = [];
|
||||||
|
|
||||||
|
circle.on('click', function(e) {
|
||||||
|
e.cancelBubble = true;
|
||||||
|
clicks.push('circle');
|
||||||
|
});
|
||||||
|
|
||||||
|
layer.on('click', function() {
|
||||||
|
clicks.push('layer');
|
||||||
|
});
|
||||||
|
|
||||||
|
circle.fire('click', {}, true);
|
||||||
|
|
||||||
|
assert.equal(clicks[0], 'circle');
|
||||||
|
assert.equal(clicks.length, 1);
|
||||||
|
});
|
||||||
|
|
||||||
test('simple event delegation', function() {
|
test('simple event delegation', function() {
|
||||||
var stage = addStage();
|
var stage = addStage();
|
||||||
var layer = new Konva.Layer();
|
var layer = new Konva.Layer();
|
||||||
|
Loading…
Reference in New Issue
Block a user