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

Merge pull request #346 from hbroer/preventdefault-fix

Browse Source 
Add check if event is cancelable before fire preventDefault
This commit is contained in:
Anton Lavrenov 2018-02-27 08:57:20 +08:00 committed by GitHub
commit eb0137bb05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Stage.js
View File

@ -494,7 +494,7 @@
// always call preventDefault for desktop events because some browsers
// try to drag and drop the canvas element
if (evt.preventDefault) {
if (evt.preventDefault && evt.cancelable) {
evt.preventDefault();
}
},
@ -526,7 +526,7 @@
// always call preventDefault for desktop events because some browsers
// try to drag and drop the canvas element
if (evt.preventDefault) {
if (evt.preventDefault && evt.cancelable) {
evt.preventDefault();
}
},
@ -602,7 +602,7 @@
// always call preventDefault for desktop events because some browsers
// try to drag and drop the canvas element
if (evt.preventDefault) {
if (evt.preventDefault && evt.cancelable) {
evt.preventDefault();
}
},
@ -623,6 +623,7 @@
if (
shape.isListening() &&
shape.preventDefault() &&
evt.cancelable &&
evt.preventDefault
) {
evt.preventDefault();
@ -672,6 +673,7 @@
if (
shape.isListening() &&
shape.preventDefault() &&
evt.cancelable &&
evt.preventDefault
) {
evt.preventDefault();
@ -710,6 +712,7 @@
if (
shape.isListening() &&
shape.preventDefault() &&
evt.cancelable &&
evt.preventDefault
) {
evt.preventDefault();
@ -718,7 +721,7 @@
this._fire(CONTENT_TOUCHMOVE, { evt: evt });
}
if (dd) {
if (Konva.isDragging() && Konva.DD.node.preventDefault()) {
if (Konva.isDragging() && Konva.DD.node.preventDefault() && evt.cancelable) {
evt.preventDefault();
}
}