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

build for 1.1.0

Browse Source
This commit is contained in:
Anton Lavrenov 2016-08-21 13:00:48 +07:00
parent 953bb6caf4
commit 4490b5f37d
3 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
konva.js
View File

@ -1,9 +1,9 @@
/* /*
* Konva JavaScript Framework v1.0.3 * Konva JavaScript Framework v1.1.0
* http://konvajs.github.io/ * http://konvajs.github.io/
* Licensed under the MIT or GPL Version 2 licenses. * Licensed under the MIT or GPL Version 2 licenses.
* Date: Sun Aug 14 2016 * Date: Sun Aug 21 2016
* *
* Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS) * Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
* Modified work Copyright (C) 2014 - 2015 by Anton Lavrenov (Konva) * Modified work Copyright (C) 2014 - 2015 by Anton Lavrenov (Konva)
@ -39,7 +39,7 @@
var Konva = { var Konva = {
// public // public
version: '1.0.3', version: '1.1.0',
// private // private
stages: [], stages: [],
@ -7702,6 +7702,28 @@
Konva.Factory.addGetterSetter(Konva.Shape, 'strokeWidth', 2); 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 * get/set stroke width
* @name strokeWidth * @name strokeWidth
@ -9237,7 +9259,7 @@
shape._fireAndBubble(TOUCHSTART, {evt: evt}); shape._fireAndBubble(TOUCHSTART, {evt: evt});
// only call preventDefault if the shape is listening for events // only call preventDefault if the shape is listening for events
if (shape.isListening() && evt.preventDefault) { if (shape.isListening() && shape.preventDefault() && evt.preventDefault) {
evt.preventDefault(); evt.preventDefault();
} }
} }
@ -9273,7 +9295,7 @@
} }
} }
// only call preventDefault if the shape is listening for events // only call preventDefault if the shape is listening for events
if (shape.isListening() && evt.preventDefault) { if (shape.isListening() && shape.preventDefault() && evt.preventDefault) {
evt.preventDefault(); evt.preventDefault();
} }
} }
@ -9297,14 +9319,14 @@
if (shape && shape.isListening()) { if (shape && shape.isListening()) {
shape._fireAndBubble(TOUCHMOVE, {evt: evt}); shape._fireAndBubble(TOUCHMOVE, {evt: evt});
// only call preventDefault if the shape is listening for events // only call preventDefault if the shape is listening for events
if (shape.isListening() && evt.preventDefault) { if (shape.isListening() && shape.preventDefault() && evt.preventDefault) {
evt.preventDefault(); evt.preventDefault();
} }
} }
this._fire(CONTENT_TOUCHMOVE, {evt: evt}); this._fire(CONTENT_TOUCHMOVE, {evt: evt});
} }
if(dd) { if(dd) {
if (Konva.isDragging()) { if (Konva.isDragging() && Konva.DD.node.preventDefault()) {
evt.preventDefault(); evt.preventDefault();
} }
} }

14
konva.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "konva", "name": "konva",
"version": "1.0.3", "version": "1.1.0",
"author": "Anton Lavrenov", "author": "Anton Lavrenov",
"files": [ "files": [
"README.md", "README.md",