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

prevent webkitMovementX deprecated message. close #96.

Browse Source
This commit is contained in:
lavrton 2015-10-12 11:34:17 +07:00
parent 140a5787ae
commit ba674dbbb4
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
konva.js
View File

@ -3,7 +3,7 @@
* Konva JavaScript Framework v0.9.9 * Konva JavaScript Framework v0.9.9
* 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: Sat Sep 19 2015 * Date: Mon Oct 12 2015
* *
* 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)
@ -6529,7 +6529,7 @@ var Konva = {};
}); });
// if node under drag we need to update drag animation // if node under drag we need to update drag animation
if (child.isDragging()) { if (Konva.DD && child.isDragging()) {
Konva.DD.anim.setLayers(child.getLayer()); Konva.DD.anim.setLayers(child.getLayer());
} }
@ -8854,7 +8854,7 @@ var Konva = {};
return this._touchmove(evt); return this._touchmove(evt);
} }
// workaround fake mousemove event in chrome browser https://code.google.com/p/chromium/issues/detail?id=161464 // workaround fake mousemove event in chrome browser https://code.google.com/p/chromium/issues/detail?id=161464
if ((typeof evt.webkitMovementX !== 'undefined' || typeof evt.webkitMovementY !== 'undefined') && evt.webkitMovementY === 0 && evt.webkitMovementX === 0) { if ((typeof evt.movementX !== 'undefined' || typeof evt.movementY !== 'undefined') && evt.movementY === 0 && evt.movementX === 0) {
return null; return null;
} }
if (Konva.UA.mobile) { if (Konva.UA.mobile) {
@ -10409,7 +10409,7 @@ var Konva = {};
_addAttr: function(key, end) { _addAttr: function(key, end) {
var node = this.node, var node = this.node,
nodeId = node._id, nodeId = node._id,
start, diff, tweenId, n, len, trueEnd; start, diff, tweenId, n, len, trueEnd, trueStart;
// remove conflict from tween map if it exists // remove conflict from tween map if it exists
tweenId = Konva.Tween.tweens[nodeId][key]; tweenId = Konva.Tween.tweens[nodeId][key];
@ -10431,6 +10431,7 @@ var Konva = {};
if (end.length > start.length) { if (end.length > start.length) {
// so in this case we will increase number of starting points // so in this case we will increase number of starting points
trueStart = start;
start = Konva.Util._prepareArrayForTween(start, end, node.closed()); start = Konva.Util._prepareArrayForTween(start, end, node.closed());
} else { } else {
// in this case we will increase number of eding points // in this case we will increase number of eding points
@ -10460,7 +10461,8 @@ var Konva = {};
start: start, start: start,
diff: diff, diff: diff,
end: end, end: end,
trueEnd: trueEnd trueEnd: trueEnd,
trueStart: trueStart
}; };
Konva.Tween.tweens[nodeId][key] = this._id; Konva.Tween.tweens[nodeId][key] = this._id;
}, },
@ -10523,6 +10525,13 @@ var Konva = {};
} }
}; };
this.tween.onReset = function() { this.tween.onReset = function() {
var node = that.node;
// after tweening points of line we need to set original start
var attrs = Konva.Tween.attrs[node._id][that._id];
if (attrs.points && attrs.points.trueStart) {
node.points(attrs.points.trueStart);
}
if (that.onReset) { if (that.onReset) {
that.onReset(); that.onReset();
} }

10
konva.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/Stage.js
View File

@ -403,7 +403,7 @@
return this._touchmove(evt); return this._touchmove(evt);
} }
// workaround fake mousemove event in chrome browser https://code.google.com/p/chromium/issues/detail?id=161464 // workaround fake mousemove event in chrome browser https://code.google.com/p/chromium/issues/detail?id=161464
if ((typeof evt.webkitMovementX !== 'undefined' || typeof evt.webkitMovementY !== 'undefined') && evt.webkitMovementY === 0 && evt.webkitMovementX === 0) { if ((typeof evt.movementX !== 'undefined' || typeof evt.movementY !== 'undefined') && evt.movementY === 0 && evt.movementX === 0) {
return null; return null;
} }
if (Konva.UA.mobile) { if (Konva.UA.mobile) {