From 0eec587cd6840315fa5e1fb5afcf4b2d720c8b92 Mon Sep 17 00:00:00 2001 From: Anton Lavrenov Date: Sat, 10 Sep 2016 07:57:50 -0400 Subject: [PATCH] fix #169 --- CHANGELOG.md | 6 +++++- src/Node.js | 24 ++++++++++++++++++++++++ src/Shape.js | 22 ---------------------- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b923511a..936f0875 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,16 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Not released][Not released] +## [1.1.2][2016-09-10] + +### Fixed +- Fixed "Dragging Group on mobile view throws "missing preventDefault" error" #169 + ## [1.1.1][2016-08-30] ### Fixed - Fixed #166 bug of drag&drop - ## [1.1.0][2016-08-21] ## Added diff --git a/src/Node.js b/src/Node.js index 34d96fb8..5459f8c2 100644 --- a/src/Node.js +++ b/src/Node.js @@ -2267,6 +2267,30 @@ * node.listening('inherit'); */ + + + /** + * get/set preventDefault + * By default all shapes will prevent default behaviour + * of a browser on a pointer move or tap. + * that will prevent native scrolling when you are trying to drag&drop a node + * but sometimes you may need to enable default actions + * in that case you can set the property to false + * @name preventDefault + * @method + * @memberof Konva.Node.prototype + * @param {Number} preventDefault + * @returns {Number} + * @example + * // get preventDefault + * var shouldPrevent = shape.preventDefault(); + * + * // set preventDefault + * shape.preventDefault(false); + */ + + Konva.Factory.addGetterSetter(Konva.Shape, 'preventDefault', true); + Konva.Factory.addGetterSetter(Konva.Node, 'filters', undefined, function(val) {this._filterUpToDate = false; return val; }); /** * get/set filters. Filters are applied to cached canvases diff --git a/src/Shape.js b/src/Shape.js index 4a0e8c9b..3f520131 100644 --- a/src/Shape.js +++ b/src/Shape.js @@ -465,28 +465,6 @@ Konva.Factory.addGetterSetter(Konva.Shape, 'strokeWidth', 2); - /** - * get/set preventDefault - * By default all shapes will prevent default behaviour - * of a browser on a pointer move or tap. - * that will prevent native scrolling when you are trying to drag&drop a shape - * but sometimes you may need to enable default actions - * in that case you can set the property to false - * @name preventDefault - * @method - * @memberof Konva.Shape.prototype - * @param {Number} preventDefault - * @returns {Number} - * @example - * // get stroke width - * var strokeWidth = shape.strokeWidth(); - * - * // set stroke width - * shape.strokeWidth(); - */ - - Konva.Factory.addGetterSetter(Konva.Shape, 'preventDefault', true); - /** * get/set stroke width * @name strokeWidth