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

better dragging flow

Browse Source
This commit is contained in:
lavrton
2015-06-02 08:14:54 +07:00
parent e990e3c9e9
commit c2d9b1d436
12 changed files with 209 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/unit/Context-test.js
View File

@@ -39,7 +39,7 @@ suite('Context', function() {
});
contextProperties.forEach(function(prop) {
assert.equal(nativeContext.hasOwnProperty(prop), true, 'native context has no property ' + prop);
assert.equal(nativeContext[prop] !== undefined, true, 'native context has no property ' + prop);
assert.equal(context[prop] !== undefined, true, 'context wrapper has no property ' + prop);
});

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

@@ -69,9 +69,6 @@ suite('DragAndDrop', function() {
// ======================================================
test('right click is not for dragging', function() {
var stage = addStage();
var top = stage.content.getBoundingClientRect().top;
var layer = new Konva.Layer();
var circle = new Konva.Circle({
@@ -88,48 +85,42 @@ suite('DragAndDrop', function() {
layer.add(circle);
stage.add(layer);
stage._mousedown({
clientX: 291,
clientY: 112 + top,
stage.simulateMouseDown({
x: 291,
y: 112
});
stage._mousemove({
clientX: 311,
clientY: 112 + top,
stage.simulateMouseMove({
x: 311,
y: 112
});
assert(circle.isDragging(), 'dragging is ok');
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 291,
clientY: 112 + top
stage.simulateMouseUp({
x: 291,
y: 112
});
Konva.DD._endDragAfter({dragEndNode:circle});
stage._mousedown({
clientX: 291,
clientY: 112 + top,
stage.simulateMouseDown({
x: 291,
y: 112,
button: 2
});
stage._mousemove({
clientX: 311,
clientY: 112 + top,
stage.simulateMouseMove({
x: 311,
y: 112,
button: 2
});
assert(circle.isDragging() === false, 'no dragging with right click');
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 291,
clientY: 112 + top,
stage.simulateMouseUp({
x: 291,
y: 112,
button: 2
});
Konva.DD._endDragAfter({dragEndNode:circle});
});
// ======================================================
@@ -177,15 +168,15 @@ suite('DragAndDrop', function() {
assert.equal(shape, rect, 'rect is detected');
stage._mousedown({
clientX: stage.width() / 2,
clientY: stage.height() / 2 + top
stage.simulateMouseDown({
x: stage.width() / 2,
y: stage.height() / 2
});
stage._mousemove({
clientX: stage.width() / 2 + 5,
clientY: stage.height() / 2 + top
stage.simulateMouseMove({
x: stage.width() / 2 + 5,
y: stage.height() / 2
});
// redraw layer. hit must be not touched for not dragging layer
@@ -207,12 +198,10 @@ suite('DragAndDrop', function() {
assert.equal(!!shape, false, 'circle is not detected');
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 291,
clientY: 112 + top
stage.simulateMouseUp({
x: 291,
y: 112 + top
});
Konva.DD._endDragAfter({dragEndNode:circle});
});
@@ -254,15 +243,15 @@ suite('DragAndDrop', function() {
endDragLayer.add(rect);
endDragLayer.draw();
stage._mousedown({
clientX: stage.width() / 2,
clientY: stage.height() / 2 + top
stage.simulateMouseDown({
x: stage.width() / 2,
y: stage.height() / 2
});
stage._mousemove({
clientX: stage.width() / 2 + 5,
clientY: stage.height() / 2 + top
stage.simulateMouseMove({
x: stage.width() / 2 + 5,
y: stage.height() / 2
});
// change layer while dragging circle
@@ -291,12 +280,10 @@ suite('DragAndDrop', function() {
assert.equal(!!shape, false, 'circle is not detected');
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 291,
clientY: 112 + top
stage.simulateMouseUp({
x: 291,
y: 112 + top
});
Konva.DD._endDragAfter({dragEndNode:circle});
});
});

55
test/unit/Stage-test.js
View File

@@ -470,54 +470,51 @@ suite('Stage', function() {
assert(false, 'double click fired');
});
var top = stage.content.getBoundingClientRect().top,
clientY = 60 + top;
var y = 60;
// simulate dragging
stage._mousedown({
clientX: 60,
clientY: clientY
stage.simulateMouseDown({
x: 60,
y: y
});
stage._mousemove({
clientX: 61,
clientY: clientY
stage.simulateMouseMove({
x: 61,
y: y
});
stage._mousemove({
clientX: 62,
clientY: clientY
stage.simulateMouseMove({
x: 62,
y: y
});
stage._mousemove({
clientX: 63,
clientY: clientY
stage.simulateMouseMove({
x: 63,
y: y
});
stage._mousemove({
clientX: 64,
clientY: clientY
stage.simulateMouseMove({
x: 64,
y: y
});
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 65,
clientY: clientY
stage.simulateMouseUp({
x: 65,
y: y
});
Konva.DD._endDragAfter({dragEndNode:rect});
assert.equal(Konva.isDragging(), false);
assert.equal(Konva.DD.node, undefined);
// simulate click
stage._mousedown({
clientX: 66,
clientY: clientY
stage.simulateMouseDown({
x: 66,
y: y
});
stage._mouseup({
clientX: 66,
clientY: clientY
stage.simulateMouseUp({
x: 66,
y: y
});
Konva.DD._endDragBefore({dragEndNode:rect});
assert.equal(Konva.isDragging(), false);
assert.equal(Konva.DD.node, undefined);
});