cleanup and type fixes

This commit is contained in:
Anton Lavrenov
2018-02-27 09:01:15 +08:00
parent 2f16b0fef3
commit 58d3731f76
3 changed files with 15 additions and 25 deletions

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 && evt.cancelable) {
if (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 && evt.cancelable) {
if (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 && evt.cancelable) {
if (evt.cancelable) {
evt.preventDefault();
}
},
@@ -620,12 +620,7 @@
shape._fireAndBubble(TOUCHSTART, { evt: evt });
// only call preventDefault if the shape is listening for events
if (
shape.isListening() &&
shape.preventDefault() &&
evt.cancelable &&
evt.preventDefault
) {
if (shape.isListening() && shape.preventDefault() && evt.cancelable) {
evt.preventDefault();
}
} else {
@@ -670,12 +665,7 @@
}
}
// only call preventDefault if the shape is listening for events
if (
shape.isListening() &&
shape.preventDefault() &&
evt.cancelable &&
evt.preventDefault
) {
if (shape.isListening() && shape.preventDefault() && evt.cancelable) {
evt.preventDefault();
}
} else {
@@ -709,19 +699,18 @@
if (shape && shape.isListening()) {
shape._fireAndBubble(TOUCHMOVE, { evt: evt });
// only call preventDefault if the shape is listening for events
if (
shape.isListening() &&
shape.preventDefault() &&
evt.cancelable &&
evt.preventDefault
) {
if (shape.isListening() && shape.preventDefault() && evt.cancelable) {
evt.preventDefault();
}
}
this._fire(CONTENT_TOUCHMOVE, { evt: evt });
}
if (dd) {
if (Konva.isDragging() && Konva.DD.node.preventDefault() && evt.cancelable) {
if (
Konva.isDragging() &&
Konva.DD.node.preventDefault() &&
evt.cancelable
) {
evt.preventDefault();
}
}