lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-10-15 12:34:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

added throttling to mousemove and touchmove. Added logic to prevent Android from detecting both touch and mouse events

Browse Source
This commit is contained in:
Eric Rowell
2014-02-26 08:46:26 -08:00
parent c2e138c6f4
commit 8fcd882ba5
2 changed files with 118 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Stage.js
View File

@@ -344,9 +344,12 @@
}
},
_mouseover: function(evt) {
if (!Kinetic.UA.mobile) {
this._fire(CONTENT_MOUSEOVER, evt);
}
},
_mouseout: function(evt) {
if (!Kinetic.UA.mobile) {
this._setPointerPosition(evt);
var targetShape = this.targetShape;
@@ -358,8 +361,10 @@
this.pointerPos = undefined;
this._fire(CONTENT_MOUSEOUT, evt);
}
},
_mousemove: function(evt) {
_mousemove: Kinetic.Util._throttle(function(evt) {
if (!Kinetic.UA.mobile) {
this._setPointerPosition(evt);
var dd = Kinetic.DD,
shape = this.getIntersection(this.getPointerPosition());
@@ -397,14 +402,16 @@
if(dd) {
dd._drag(evt);
}
}
// always call preventDefault for desktop events because some browsers
// try to drag and drop the canvas element
if (evt.preventDefault) {
evt.preventDefault();
}
},
}, 17),
_mousedown: function(evt) {
if (!Kinetic.UA.mobile) {
this._setPointerPosition(evt);
var shape = this.getIntersection(this.getPointerPosition());
@@ -417,6 +424,7 @@
// content event
this._fire(CONTENT_MOUSEDOWN, evt);
}
// always call preventDefault for desktop events because some browsers
// try to drag and drop the canvas element
@@ -425,6 +433,7 @@
}
},
_mouseup: function(evt) {
if (!Kinetic.UA.mobile) {
this._setPointerPosition(evt);
var that = this,
shape = this.getIntersection(this.getPointerPosition()),
@@ -465,6 +474,7 @@
}
Kinetic.listenClickTap = false;
}
// always call preventDefault for desktop events because some browsers
// try to drag and drop the canvas element
@@ -534,7 +544,7 @@
Kinetic.listenClickTap = false;
},
_touchmove: function(evt) {
_touchmove: Kinetic.Util._throttle(function(evt) {
this._setPointerPosition(evt);
var dd = Kinetic.DD,
shape = this.getIntersection(this.getPointerPosition());
@@ -553,7 +563,7 @@
if(dd) {
dd._drag(evt);
}
},
}, 17),
_setPointerPosition: function(evt) {
var evt = evt ? evt : window.event,
contentPosition = this._getContentPosition(),

9
test/unit/DragAndDrop-test.js
View File

@@ -1,7 +1,7 @@
suite('DragAndDrop', function() {
// ======================================================
test('test drag and drop properties and methods', function() {
test('test drag and drop properties and methods', function(done) {
var stage = addStage();
var layer = new Kinetic.Layer();
var circle = new Kinetic.Circle({
@@ -18,10 +18,11 @@ suite('DragAndDrop', function() {
layer.add(circle);
setTimeout(function() {
layer.draw();
// test defaults
//assert.equal(circle.draggable(), false);
assert.equal(circle.draggable(), false);
//change properties
circle.setDraggable(true);
@@ -34,7 +35,9 @@ suite('DragAndDrop', function() {
showHit(layer);
// test new properties
//assert.equal(circle.getDraggable(), true);
assert.equal(circle.getDraggable(), true);
done();
}, 50);
});