lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-05-04 04:57:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/kinetic-core.js vendored
View File

@ -3,7 +3,7 @@
* http://www.kineticjs.com/ * http://www.kineticjs.com/
* Copyright 2012, Eric Rowell * Copyright 2012, Eric Rowell
* Licensed under the MIT or GPL Version 2 licenses. * Licensed under the MIT or GPL Version 2 licenses.
* Date: Jul 06 2012 * Date: Jul 07 2012
* *
* Copyright (C) 2011 - 2012 by Eric Rowell * Copyright (C) 2011 - 2012 by Eric Rowell
* *
@ -35,6 +35,7 @@
*/ */
var Kinetic = {}; var Kinetic = {};
Kinetic.Global = { Kinetic.Global = {
BUBBLE_WHITELIST: ['mousedown', 'mousemove', 'mouseup', 'mouseover', 'mouseout', 'click', 'dblclick', 'touchstart', 'touchmove', 'touchend', 'tap', 'dbltap', 'dragstart', 'dragmove', 'dragend'],
stages: [], stages: [],
idCounter: 0, idCounter: 0,
tempNodes: [], tempNodes: [],
@ -1182,7 +1183,7 @@ Kinetic.Node = Kinetic.Class.extend({
} }
// simulate event bubbling // 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); this._handleEvent.call(this.parent, eventType, evt);
} }
} }

6
dist/kinetic-core.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
src/Global.js
View File

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

2
src/Node.js
View File

@ -762,7 +762,7 @@ Kinetic.Node = Kinetic.Class.extend({
} }
// simulate event bubbling // 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); this._handleEvent.call(this.parent, eventType, evt);
} }
} }

2
tests/assets/functionalDataUrls.js
View File

File diff suppressed because one or more lines are too long