lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-06-28 15:23:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup and type fixes

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

1
CHANGELOG.md
View File

@ -19,6 +19,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## Fixed
* Some typescript fixes
* Pixelate filter fixes
## [1.7.6][2017-11-01]

6
konva.d.ts vendored
View File

@ -85,6 +85,7 @@ declare namespace Konva {
draggable?: boolean;
dragDistance?: number;
dragBoundFunc?: (pos: Vector2d) => Vector2d;
preventDefault?: boolean;
}
interface SizeConfig {
@ -110,6 +111,8 @@ declare namespace Konva {
class Node {
constructor(config: NodeConfig);
static create<T>(data: any, container?: HTMLElement): T;
preventDefault(): boolean;
preventDefault(preventDefault: boolean): this;
addName(name: string): Node;
blue(): number;
@ -360,13 +363,10 @@ declare namespace Konva {
shadowEnabled?: boolean;
dash?: number[];
dashEnabled?: boolean;
preventDefault?: boolean;
}
class Shape extends Node {
constructor(ShapeConfig: ShapeConfig);
preventDefault(): boolean;
preventDefault(preventDefault: boolean): this;
dash(): number[];
dash(dash: number[]): this;
dashEnabled(): boolean;

33
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 && 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();
}
}