attr change events no longer bubble. updated functional test data urls

This commit is contained in:
Eric Rowell
2012-07-07 11:52:04 -07:00
parent 9baaee2440
commit 7f7cd24838
5 changed files with 9 additions and 7 deletions

View File

@@ -7,6 +7,7 @@
*/
var Kinetic = {};
Kinetic.Global = {
BUBBLE_WHITELIST: ['mousedown', 'mousemove', 'mouseup', 'mouseover', 'mouseout', 'click', 'dblclick', 'touchstart', 'touchmove', 'touchend', 'tap', 'dbltap', 'dragstart', 'dragmove', 'dragend'],
stages: [],
idCounter: 0,
tempNodes: [],

View File

@@ -762,7 +762,7 @@ Kinetic.Node = Kinetic.Class.extend({
}
// simulate event bubbling
if(!evt.cancelBubble && this.parent) {
if(Kinetic.Global.BUBBLE_WHITELIST.indexOf(eventType) >= 0 && !evt.cancelBubble && this.parent) {
this._handleEvent.call(this.parent, eventType, evt);
}
}