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

test fixes

Browse Source
This commit is contained in:
Anton Lavrenov 2017-03-24 09:07:34 -05:00
parent 4834f78347
commit 8e7ce7ff4f
8 changed files with 220 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
konva.js
View File

@ -10402,7 +10402,7 @@
this._mousewheel(evt); this._mousewheel(evt);
}, },
_setPointerPosition: function(evt) { _setPointerPosition: function(evt) {
var contentPosition = this._getContentPosition(), x = null, y = null; var x = null, y = null;
evt = evt ? evt : window.event; evt = evt ? evt : window.event;
// touch events // touch events

6
konva.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/Stage.js
View File

@ -696,7 +696,7 @@
this._mousewheel(evt); this._mousewheel(evt);
}, },
_setPointerPosition: function(evt) { _setPointerPosition: function(evt) {
var contentPosition = this._getContentPosition(), x = null, y = null; var x = null, y = null;
evt = evt ? evt : window.event; evt = evt ? evt : window.event;
// touch events // touch events

362
test/functional/MouseEvents-test.js
View File

@ -61,14 +61,14 @@ suite('MouseEvents', function() {
stageContentDblClick++; stageContentDblClick++;
}); });
stage._mousedown({ stage.simulateMouseDown({
clientX: 100, x: 100,
clientY: 100 + top y: 100
}); });
stage._mouseup({ stage.simulateMouseUp({
clientX: 100, x: 100,
clientY: 100 + top y: 100
}); });
assert.equal(circleMousedown, 1); assert.equal(circleMousedown, 1);
@ -77,26 +77,26 @@ suite('MouseEvents', function() {
assert.equal(stageContentMouseup, 1); assert.equal(stageContentMouseup, 1);
assert.equal(stageContentClick, 1); assert.equal(stageContentClick, 1);
stage._mousedown({ stage.simulateMouseDown({
clientX: 1, x: 1,
clientY: 1 + top y: 1
}); });
stage._mouseup({ stage.simulateMouseUp({
clientX: 1, x: 1,
clientY: 1 + top y: 1
}); });
assert.equal(stageContentMousedown, 2); assert.equal(stageContentMousedown, 2);
assert.equal(stageContentMouseup, 2); assert.equal(stageContentMouseup, 2);
// trigger double click // trigger double click
stage._mousedown({ stage.simulateMouseDown({
clientX: 1, x: 1,
clientY: 1 + top y: 1
}); });
stage._mouseup({ stage.simulateMouseUp({
clientX: 1, x: 1,
clientY: 1 + top y: 1
}); });
assert.equal(stageContentMousedown, 3); assert.equal(stageContentMousedown, 3);
@ -105,23 +105,23 @@ suite('MouseEvents', function() {
setTimeout( setTimeout(
function() { function() {
stage._mousemove({ stage.simulateMouseMove({
clientX: 200, x: 200,
clientY: 1 + top y: 1
}); });
assert.equal(stageContentMousemove, 1); assert.equal(stageContentMousemove, 1);
stage._mouseout({ stage._mouseout({
clientX: 0, offsetX: 0,
clientY: 0 offsetY: 0
}); });
assert.equal(stageContentMouseout, 1); assert.equal(stageContentMouseout, 1);
stage._mouseover({ stage._mouseover({
clientX: 0, offsetX: 0,
clientY: 0 offsetY: 0
}); });
assert.equal(stageContentMouseover, 1); assert.equal(stageContentMouseover, 1);
@ -163,15 +163,15 @@ suite('MouseEvents', function() {
setTimeout(remove, 0); setTimeout(remove, 0);
}); });
stage._mousedown({ stage.simulateMouseDown({
clientX: 291, x: 291,
clientY: 112 + top y: 112
}); });
Konva.DD._endDragBefore(); Konva.DD._endDragBefore();
stage._mouseup({ stage.simulateMouseUp({
clientX: 291, x: 291,
clientY: 112 + top y: 112
}); });
Konva.DD._endDragAfter({ dragEndNode: circle }); Konva.DD._endDragAfter({ dragEndNode: circle });
}); });
@ -204,27 +204,27 @@ suite('MouseEvents', function() {
stage.add(layer); stage.add(layer);
// ----------------------------------- // -----------------------------------
stage._mousedown({ stage.simulateMouseDown({
clientX: 291, x: 291,
clientY: 112 + top y: 112
}); });
Konva.DD._endDragBefore(); Konva.DD._endDragBefore();
stage._mouseup({ stage.simulateMouseUp({
clientX: 291, x: 291,
clientY: 112 + top y: 112
}); });
assert.equal(clickCount, 1, 'should be 1 click'); assert.equal(clickCount, 1, 'should be 1 click');
// ----------------------------------- // -----------------------------------
circle.setListening(false); circle.setListening(false);
stage._mousedown({ stage.simulateMouseDown({
clientX: 291, x: 291,
clientY: 112 + top y: 112
}); });
Konva.DD._endDragBefore(); Konva.DD._endDragBefore();
stage._mouseup({ stage.simulateMouseUp({
clientX: 291, x: 291,
clientY: 112 + top y: 112
}); });
assert.equal( assert.equal(
clickCount, clickCount,
@ -234,14 +234,14 @@ suite('MouseEvents', function() {
// ----------------------------------- // -----------------------------------
circle.setListening(true); circle.setListening(true);
stage._mousedown({ stage.simulateMouseDown({
clientX: 291, x: 291,
clientY: 112 + top y: 112
}); });
Konva.DD._endDragBefore(); Konva.DD._endDragBefore();
stage._mouseup({ stage.simulateMouseUp({
clientX: 291, x: 291,
clientY: 112 + top y: 112
}); });
assert.equal(clickCount, 2, 'should be 2 clicks'); assert.equal(clickCount, 2, 'should be 2 clicks');
}); });
@ -298,15 +298,15 @@ suite('MouseEvents', function() {
showHit(layer); showHit(layer);
// mousedown and mouseup on red circle // mousedown and mouseup on red circle
stage._mousedown({ stage.simulateMouseDown({
clientX: 284, x: 284,
clientY: 113 + top y: 113
}); });
Konva.DD._endDragBefore(); Konva.DD._endDragBefore();
stage._mouseup({ stage.simulateMouseUp({
clientX: 284, x: 284,
clientY: 113 + top y: 113
}); });
Konva.DD._endDragAfter({ dragEndNode: redCircle }); Konva.DD._endDragAfter({ dragEndNode: redCircle });
@ -314,15 +314,15 @@ suite('MouseEvents', function() {
assert.equal(greenClicks, 0, 'green circle should have 0 clicks'); assert.equal(greenClicks, 0, 'green circle should have 0 clicks');
// mousedown and mouseup on green circle // mousedown and mouseup on green circle
stage._mousedown({ stage.simulateMouseDown({
clientX: 397, x: 397,
clientY: 108 + top y: 108
}); });
Konva.DD._endDragBefore(); Konva.DD._endDragBefore();
stage._mouseup({ stage.simulateMouseUp({
clientX: 397, x: 397,
clientY: 108 + top y: 108
}); });
Konva.DD._endDragAfter({ dragEndNode: redCircle }); Konva.DD._endDragAfter({ dragEndNode: redCircle });
@ -330,15 +330,15 @@ suite('MouseEvents', function() {
assert.equal(greenClicks, 1, 'green circle should have 1 click'); assert.equal(greenClicks, 1, 'green circle should have 1 click');
// mousedown red circle and mouseup on green circle // mousedown red circle and mouseup on green circle
stage._mousedown({ stage.simulateMouseDown({
clientX: 284, x: 284,
clientY: 113 + top y: 113
}); });
Konva.DD._endDragBefore(); Konva.DD._endDragBefore();
stage._mouseup({ stage.simulateMouseUp({
clientX: 397, x: 397,
clientY: 108 + top y: 108
}); });
Konva.DD._endDragAfter({ dragEndNode: redCircle }); Konva.DD._endDragAfter({ dragEndNode: redCircle });
@ -374,15 +374,15 @@ suite('MouseEvents', function() {
showHit(layer); showHit(layer);
stage._mousedown({ stage.simulateMouseDown({
clientX: 300, x: 300,
clientY: 120 + top y: 120
}); });
Konva.DD._endDragBefore(); Konva.DD._endDragBefore();
stage._mouseup({ stage.simulateMouseUp({
clientX: 300, x: 300,
clientY: 120 + top y: 120
}); });
Konva.DD._endDragAfter({ dragEndNode: text }); Konva.DD._endDragAfter({ dragEndNode: text });
@ -437,9 +437,9 @@ suite('MouseEvents', function() {
setTimeout( setTimeout(
function() { function() {
stage._mousemove({ stage.simulateMouseMove({
clientX: 377, x: 377,
clientY: 101 + top y: 101
}); });
assert.equal( assert.equal(
@ -456,9 +456,9 @@ suite('MouseEvents', function() {
setTimeout( setTimeout(
function() { function() {
// move mouse back out of circle // move mouse back out of circle
stage._mousemove({ stage.simulateMouseMove({
clientX: 157, x: 157,
clientY: 138 + top y: 138
}); });
assert.equal(circle.getFill(), 'red', 'circle fill should be red'); assert.equal(circle.getFill(), 'red', 'circle fill should be red');
@ -543,9 +543,9 @@ suite('MouseEvents', function() {
setTimeout( setTimeout(
function() { function() {
// move mouse to center of circle to trigger mouseover // move mouse to center of circle to trigger mouseover
stage._mousemove({ stage.simulateMouseMove({
clientX: 290, x: 290,
clientY: 100 + top y: 100
}); });
assert(mouseover, '1) mouseover should be true'); assert(mouseover, '1) mouseover should be true');
@ -559,9 +559,9 @@ suite('MouseEvents', function() {
setTimeout( setTimeout(
function() { function() {
// move mouse again inside circle to trigger mousemove // move mouse again inside circle to trigger mousemove
stage._mousemove({ stage.simulateMouseMove({
clientX: 290, x: 290,
clientY: 100 + top y: 100
}); });
assert(mouseover, '2) mouseover should be true'); assert(mouseover, '2) mouseover should be true');
@ -573,9 +573,9 @@ suite('MouseEvents', function() {
assert(!mouseout, '2) mouseout should be false'); assert(!mouseout, '2) mouseout should be false');
// mousedown inside circle // mousedown inside circle
stage._mousedown({ stage.simulateMouseDown({
clientX: 290, x: 290,
clientY: 100 + top y: 100
}); });
assert(mouseover, '3) mouseover should be true'); assert(mouseover, '3) mouseover should be true');
@ -587,9 +587,9 @@ suite('MouseEvents', function() {
assert(!mouseout, '3) mouseout should be false'); assert(!mouseout, '3) mouseout should be false');
// mouseup inside circle // mouseup inside circle
stage._mouseup({ stage.simulateMouseUp({
clientX: 290, x: 290,
clientY: 100 + top y: 100
}); });
assert(mouseover, '4) mouseover should be true'); assert(mouseover, '4) mouseover should be true');
@ -601,9 +601,9 @@ suite('MouseEvents', function() {
assert(!mouseout, '4) mouseout should be false'); assert(!mouseout, '4) mouseout should be false');
// mousedown inside circle // mousedown inside circle
stage._mousedown({ stage.simulateMouseDown({
clientX: 290, x: 290,
clientY: 100 + top y: 100
}); });
assert(mouseover, '5) mouseover should be true'); assert(mouseover, '5) mouseover should be true');
@ -615,9 +615,9 @@ suite('MouseEvents', function() {
assert(!mouseout, '5) mouseout should be false'); assert(!mouseout, '5) mouseout should be false');
// mouseup inside circle to trigger double click // mouseup inside circle to trigger double click
stage._mouseup({ stage.simulateMouseUp({
clientX: 290, x: 290,
clientY: 100 + top y: 100
}); });
assert(mouseover, '6) mouseover should be true'); assert(mouseover, '6) mouseover should be true');
@ -631,9 +631,9 @@ suite('MouseEvents', function() {
setTimeout( setTimeout(
function() { function() {
// move mouse outside of circle to trigger mouseout // move mouse outside of circle to trigger mouseout
stage._mousemove({ stage.simulateMouseMove({
clientX: 0, x: 0,
clientY: 100 + top y: 100
}); });
assert(mouseover, '7) mouseover should be true'); assert(mouseover, '7) mouseover should be true');
@ -701,33 +701,33 @@ suite('MouseEvents', function() {
greenCircleMousedowns++; greenCircleMousedowns++;
}); });
stage._mousedown({ stage.simulateMouseDown({
clientX: 285, x: 285,
clientY: 100 + top y: 100
}); });
assert.equal(groupMousedowns, 1, 'groupMousedowns should be 1'); assert.equal(groupMousedowns, 1, 'groupMousedowns should be 1');
assert.equal(greenCircleMousedowns, 1, 'greenCircleMousedowns should be 1'); assert.equal(greenCircleMousedowns, 1, 'greenCircleMousedowns should be 1');
stage._mousedown({ stage.simulateMouseDown({
clientX: 332, x: 332,
clientY: 139 + top y: 139
}); });
assert.equal(groupMousedowns, 2, 'groupMousedowns should be 2'); assert.equal(groupMousedowns, 2, 'groupMousedowns should be 2');
assert.equal(greenCircleMousedowns, 1, 'greenCircleMousedowns should be 1'); assert.equal(greenCircleMousedowns, 1, 'greenCircleMousedowns should be 1');
stage._mousedown({ stage.simulateMouseDown({
clientX: 285, x: 285,
clientY: 92 + top y: 92
}); });
assert.equal(groupMousedowns, 3, 'groupMousedowns should be 3'); assert.equal(groupMousedowns, 3, 'groupMousedowns should be 3');
assert.equal(greenCircleMousedowns, 2, 'greenCircleMousedowns should be 2'); assert.equal(greenCircleMousedowns, 2, 'greenCircleMousedowns should be 2');
stage._mousedown({ stage.simulateMouseDown({
clientX: 221, x: 221,
clientY: 146 + top y: 146
}); });
//assert.equal(groupMousedowns, 4, 'groupMousedowns should be 4'); //assert.equal(groupMousedowns, 4, 'groupMousedowns should be 4');
@ -765,9 +765,9 @@ suite('MouseEvents', function() {
layer.draw(); layer.draw();
var top = stage.content.getBoundingClientRect().top; var top = stage.content.getBoundingClientRect().top;
stage._mousedown({ stage.simulateMouseDown({
clientX: 135, x: 135,
clientY: 30 + top y: 30
}); });
assert.equal(groupMousedowns, 1, 'groupMousedowns should be 1'); assert.equal(groupMousedowns, 1, 'groupMousedowns should be 1');
@ -809,9 +809,9 @@ suite('MouseEvents', function() {
var top = stage.content.getBoundingClientRect().top; var top = stage.content.getBoundingClientRect().top;
// move mouse slowly // move mouse slowly
for (var i = 99; i < 129; i++) { for (var i = 99; i < 129; i++) {
stage._mousemove({ stage.simulateMouseMove({
clientX: i, x: i,
clientY: 135 + top y: 135
}); });
} }
assert.equal(mouseenterCount, 1, 'mouseenterCount should be 1'); assert.equal(mouseenterCount, 1, 'mouseenterCount should be 1');
@ -893,9 +893,9 @@ suite('MouseEvents', function() {
setTimeout( setTimeout(
function() { function() {
// move mouse outside of circles // move mouse outside of circles
stage._mousemove({ stage.simulateMouseMove({
clientX: 177, x: 177,
clientY: 146 + top y: 146
}); });
assert.equal(redMouseenters, 0, 'redMouseenters should be 0'); assert.equal(redMouseenters, 0, 'redMouseenters should be 0');
@ -908,9 +908,9 @@ suite('MouseEvents', function() {
setTimeout( setTimeout(
function() { function() {
// move mouse inside of red circle // move mouse inside of red circle
stage._mousemove({ stage.simulateMouseMove({
clientX: 236, x: 236,
clientY: 145 + top y: 145
}); });
//console.log('groupMouseenters=' + groupMouseenters); //console.log('groupMouseenters=' + groupMouseenters);
@ -925,9 +925,9 @@ suite('MouseEvents', function() {
setTimeout( setTimeout(
function() { function() {
// move mouse inside of green circle // move mouse inside of green circle
stage._mousemove({ stage.simulateMouseMove({
clientX: 284, x: 284,
clientY: 118 + top y: 118
}); });
assert.equal(redMouseenters, 1, 'redMouseenters should be 1'); assert.equal(redMouseenters, 1, 'redMouseenters should be 1');
@ -957,9 +957,9 @@ suite('MouseEvents', function() {
function() { function() {
// move mouse back to red circle // move mouse back to red circle
stage._mousemove({ stage.simulateMouseMove({
clientX: 345, x: 345,
clientY: 105 + top y: 105
}); });
assert.equal( assert.equal(
@ -996,9 +996,9 @@ suite('MouseEvents', function() {
setTimeout( setTimeout(
function() { function() {
// move mouse outside of circles // move mouse outside of circles
stage._mousemove({ stage.simulateMouseMove({
clientX: 177, x: 177,
clientY: 146 + top y: 146
}); });
assert.equal( assert.equal(
@ -1131,9 +1131,9 @@ suite('MouseEvents', function() {
var top = stage.content.getBoundingClientRect().top; var top = stage.content.getBoundingClientRect().top;
stage._mousemove({ stage.simulateMouseMove({
clientX: 10, x: 10,
clientY: 10 + top y: 10
}); });
assert.equal(groupMouseenter, 1, 'move1 : group mouseenter should trigger'); assert.equal(groupMouseenter, 1, 'move1 : group mouseenter should trigger');
assert.equal( assert.equal(
@ -1167,9 +1167,9 @@ suite('MouseEvents', function() {
'move1 : group2 mouseout should not trigger' 'move1 : group2 mouseout should not trigger'
); );
stage._mousemove({ stage.simulateMouseMove({
clientX: 50, x: 50,
clientY: 50 + top y: 50
}); });
assert.equal( assert.equal(
groupMouseenter, groupMouseenter,
@ -1203,9 +1203,9 @@ suite('MouseEvents', function() {
'move2 : group2 mouseout should not trigger' 'move2 : group2 mouseout should not trigger'
); );
stage._mousemove({ stage.simulateMouseMove({
clientX: 10, x: 10,
clientY: 10 + top y: 10
}); });
assert.equal( assert.equal(
groupMouseenter, groupMouseenter,
@ -1235,9 +1235,9 @@ suite('MouseEvents', function() {
assert.equal(groupMouseout, 2, 'move3 : group mouseout should trigger'); assert.equal(groupMouseout, 2, 'move3 : group mouseout should trigger');
assert.equal(group2Mouseout, 1, 'move3 : group2 mouseout should trigger'); assert.equal(group2Mouseout, 1, 'move3 : group2 mouseout should trigger');
stage._mousemove({ stage.simulateMouseMove({
clientX: 50, x: 50,
clientY: 50 + top y: 50
}); });
assert.equal(groupMouseenter, 1, 'move4 : mouseenter should not trigger'); assert.equal(groupMouseenter, 1, 'move4 : mouseenter should not trigger');
@ -1359,9 +1359,9 @@ suite('MouseEvents', function() {
var top = stage.content.getBoundingClientRect().top; var top = stage.content.getBoundingClientRect().top;
stage._mousemove({ stage.simulateMouseMove({
clientX: 10, x: 10,
clientY: 10 + top y: 10
}); });
assert.equal( assert.equal(
@ -1370,9 +1370,9 @@ suite('MouseEvents', function() {
'move1 : group1 mouseenter should trigger' 'move1 : group1 mouseenter should trigger'
); );
stage._mousemove({ stage.simulateMouseMove({
clientX: 60, x: 60,
clientY: 60 + top y: 60
}); });
assert.equal( assert.equal(
group21Mouseenter, group21Mouseenter,
@ -1390,9 +1390,9 @@ suite('MouseEvents', function() {
'move2 : group1 mouseleave should trigger' 'move2 : group1 mouseleave should trigger'
); );
stage._mousemove({ stage.simulateMouseMove({
clientX: 10, x: 10,
clientY: 10 + top y: 10
}); });
assert.equal( assert.equal(
@ -1640,14 +1640,14 @@ suite('MouseEvents', function() {
e.push('stage'); e.push('stage');
}); });
// click on circle // click on circle
stage._mousedown({ stage.simulateMouseDown({
clientX: 374, x: 374,
clientY: 114 + top y: 114
}); });
Konva.DD._endDragBefore(); Konva.DD._endDragBefore();
stage._mouseup({ stage.simulateMouseUp({
clientX: 374, x: 374,
clientY: 114 + top y: 114
}); });
Konva.DD._endDragAfter({ dragEndNode: circle }); Konva.DD._endDragAfter({ dragEndNode: circle });
@ -1700,9 +1700,9 @@ suite('MouseEvents', function() {
setTimeout( setTimeout(
function() { function() {
// move mouse far outside circle // move mouse far outside circle
stage._mousemove({ stage.simulateMouseMove({
clientX: 113, x: 113,
clientY: 112 + top y: 112
}); });
setTimeout( setTimeout(
@ -1710,9 +1710,9 @@ suite('MouseEvents', function() {
assert.equal(mouseovers, 0, '1) mouseovers should be 0'); assert.equal(mouseovers, 0, '1) mouseovers should be 0');
assert.equal(mouseouts, 0, '1) mouseouts should be 0'); assert.equal(mouseouts, 0, '1) mouseouts should be 0');
stage._mousemove({ stage.simulateMouseMove({
clientX: 286, x: 286,
clientY: 118 + top y: 118
}); });
assert.equal(mouseovers, 1, '2) mouseovers should be 1'); assert.equal(mouseovers, 1, '2) mouseovers should be 1');
@ -1720,9 +1720,9 @@ suite('MouseEvents', function() {
setTimeout( setTimeout(
function() { function() {
stage._mousemove({ stage.simulateMouseMove({
clientX: 113, x: 113,
clientY: 112 + top y: 112
}); });
assert.equal(mouseovers, 1, '3) mouseovers should be 1'); assert.equal(mouseovers, 1, '3) mouseovers should be 1');
@ -1753,9 +1753,9 @@ suite('MouseEvents', function() {
setTimeout( setTimeout(
function() { function() {
// move mouse far outside circle // move mouse far outside circle
stage._mousemove({ stage.simulateMouseMove({
clientX: 113, x: 113,
clientY: 112 + top y: 112
}); });
assert.equal(mouseovers, 1, '4) mouseovers should be 1'); assert.equal(mouseovers, 1, '4) mouseovers should be 1');
@ -1763,9 +1763,9 @@ suite('MouseEvents', function() {
setTimeout( setTimeout(
function() { function() {
stage._mousemove({ stage.simulateMouseMove({
clientX: 286, x: 286,
clientY: 118 + top y: 118
}); });
assert.equal( assert.equal(
@ -1777,9 +1777,9 @@ suite('MouseEvents', function() {
setTimeout( setTimeout(
function() { function() {
stage._mousemove({ stage.simulateMouseMove({
clientX: 321, x: 321,
clientY: 112 + top y: 112
}); });
assert.equal( assert.equal(
@ -1796,9 +1796,9 @@ suite('MouseEvents', function() {
setTimeout( setTimeout(
function() { function() {
// move to center of circle // move to center of circle
stage._mousemove({ stage.simulateMouseMove({
clientX: 375, x: 375,
clientY: 112 + top y: 112
}); });
assert.equal( assert.equal(

28
test/functional/TouchEvents-test.js
View File

@ -51,8 +51,8 @@ suite('TouchEvents', function() {
stage._touchstart({ stage._touchstart({
touches: [ touches: [
{ {
clientX: 100, offsetX: 100,
clientY: 100 + top offsetY: 100
} }
] ]
}); });
@ -70,8 +70,8 @@ suite('TouchEvents', function() {
stage._touchstart({ stage._touchstart({
touches: [ touches: [
{ {
clientX: 1, offsetX: 1,
clientY: 1 + top offsetY: 1
} }
] ]
}); });
@ -146,8 +146,8 @@ suite('TouchEvents', function() {
stage._touchstart({ stage._touchstart({
touches: [ touches: [
{ {
clientX: 289, offsetX: 289,
clientY: 100 + top offsetY: 100
} }
], ],
preventDefault: function() {} preventDefault: function() {}
@ -178,8 +178,8 @@ suite('TouchEvents', function() {
stage._touchstart({ stage._touchstart({
touches: [ touches: [
{ {
clientX: 289, offsetX: 289,
clientY: 100 + top offsetY: 100
} }
], ],
preventDefault: function() {} preventDefault: function() {}
@ -212,8 +212,8 @@ suite('TouchEvents', function() {
stage._touchmove({ stage._touchmove({
touches: [ touches: [
{ {
clientX: 290, offsetX: 290,
clientY: 100 + top offsetY: 100
} }
], ],
preventDefault: function() {} preventDefault: function() {}
@ -267,8 +267,8 @@ suite('TouchEvents', function() {
stage._touchstart({ stage._touchstart({
touches: [ touches: [
{ {
clientX: 1, offsetX: 1,
clientY: 1 + top offsetY: 1
} }
] ]
}); });
@ -276,8 +276,8 @@ suite('TouchEvents', function() {
stage._touchend({ stage._touchend({
touches: [ touches: [
{ {
clientX: 100, offsetX: 100,
clientY: 100 + top offsetY: 100
} }
] ]
}); });

18
test/runner.js
View File

@ -226,21 +226,17 @@ afterEach(function() {
}); });
Konva.Stage.prototype.simulateMouseDown = function(pos) { Konva.Stage.prototype.simulateMouseDown = function(pos) {
var clientRect = this.content.getBoundingClientRect();
this._mousedown({ this._mousedown({
clientX: pos.x + clientRect.left, offsetX: pos.x,
clientY: pos.y + clientRect.top, offsetY: pos.y,
button: pos.button button: pos.button
}); });
}; };
Konva.Stage.prototype.simulateMouseMove = function(pos) { Konva.Stage.prototype.simulateMouseMove = function(pos) {
var clientRect = this.content.getBoundingClientRect();
var evt = { var evt = {
clientX: pos.x + clientRect.left, offsetX: pos.x,
clientY: pos.y + clientRect.top, offsetY: pos.y,
button: pos.button button: pos.button
}; };
@ -250,11 +246,9 @@ Konva.Stage.prototype.simulateMouseMove = function(pos) {
Konva.Stage.prototype.simulateMouseUp = function(pos) { Konva.Stage.prototype.simulateMouseUp = function(pos) {
'use strict'; 'use strict';
var clientRect = this.content.getBoundingClientRect();
var evt = { var evt = {
clientX: pos.x + clientRect.left, offsetX: pos.x,
clientY: pos.y + clientRect.top, offsetY: pos.y,
button: pos.button button: pos.button
}; };

13
test/unit/Node-test.js
View File

@ -3002,14 +3002,13 @@ suite('Node', function() {
showHit(layer); showHit(layer);
var top = stage.content.getBoundingClientRect().top; var top = stage.content.getBoundingClientRect().top;
stage._mousedown({ stage.simulateMouseDown({
clientX: 150, x: 150,
clientY: 75 + top y: 75
}); });
Konva.DD._endDragBefore(); stage.simulateMouseUp({
stage._mouseup({ x: 150,
clientX: 150, y: 75
clientY: 75 + top
}); });
assert.equal(rectClick, 1, 'click on rectangle'); assert.equal(rectClick, 1, 'click on rectangle');

16
test/unit/Shape-test.js
View File

@ -940,17 +940,17 @@ suite('Shape', function() {
showHit(layer); showHit(layer);
stage._mousedown({ stage.simulateMouseDown({
clientX: 300, x: 300,
clientY: 120 + top y: 120
}); });
Konva.DD._endDragBefore(); // Konva.DD._endDragBefore();
stage._mouseup({ stage.simulateMouseUp({
clientX: 300, x: 300,
clientY: 120 + top y: 120
}); });
Konva.DD._endDragAfter({ dragEndNode: rect }); // Konva.DD._endDragAfter({ dragEndNode: rect });
//TODO: can't get this to pass //TODO: can't get this to pass
assert.equal( assert.equal(