lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-11-24 08:46:44 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Renaming

Browse Source
This commit is contained in:
Jovination
2015-01-27 00:07:51 -07:00
parent b585ba4daf
commit 607ef1837b
130 changed files with 5722 additions and 5713 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
test/functional/DragAndDropEvents-test.js
View File

@@ -3,9 +3,9 @@ suite('DragAndDropEvents', function() {
test('test dragstart, dragmove, dragend', function(done) {
var stage = addStage();
var layer = new Kinetic.Layer();
var layer = new Konva.Layer();
var greenCircle = new Kinetic.Circle({
var greenCircle = new Konva.Circle({
x: 40,
y: 40,
radius: 20,
@@ -16,7 +16,7 @@ suite('DragAndDropEvents', function() {
});
var circle = new Kinetic.Circle({
var circle = new Konva.Circle({
x: 380,
y: stage.getHeight() / 2,
radius: 70,
@@ -70,8 +70,8 @@ suite('DragAndDropEvents', function() {
});
assert(!Kinetic.isDragging(), ' isDragging() should be false 1');
assert(!Kinetic.isDragReady(), ' isDragReady()) should be false 2');
assert(!Konva.isDragging(), ' isDragging() should be false 1');
assert(!Konva.isDragReady(), ' isDragReady()) should be false 2');
/*
* simulate drag and drop
@@ -86,8 +86,8 @@ suite('DragAndDropEvents', function() {
//assert.equal(!dragMove, 'dragmove event should not have been triggered');
assert(!dragEnd, 'dragend event should not have been triggered 4');
assert(!Kinetic.isDragging(), ' isDragging() should be false 5');
assert(Kinetic.isDragReady(), ' isDragReady()) should be true 6');
assert(!Konva.isDragging(), ' isDragging() should be false 5');
assert(Konva.isDragReady(), ' isDragReady()) should be true 6');
setTimeout(function() {
stage._mousemove({
@@ -95,19 +95,19 @@ suite('DragAndDropEvents', function() {
clientY: 98 + top
});
assert(Kinetic.isDragging(), ' isDragging() should be true 7');
assert(Kinetic.isDragReady(), ' isDragReady()) should be true 8');
assert(Konva.isDragging(), ' isDragging() should be true 7');
assert(Konva.isDragReady(), ' isDragReady()) should be true 8');
assert(dragStart, 'dragstart event was not triggered 9');
//assert.equal(dragMove, 'dragmove event was not triggered');
assert(!dragEnd, 'dragend event should not have been triggered 10');
Kinetic.DD._endDragBefore();
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 100,
clientY: 98 + top
});
Kinetic.DD._endDragAfter({dragEndNode:circle});
Konva.DD._endDragAfter({dragEndNode:circle});
assert(dragStart, 'dragstart event was not triggered 11');
assert(dragMove, 'dragmove event was not triggered 12');
@@ -116,8 +116,8 @@ suite('DragAndDropEvents', function() {
assert.equal(events.toString(), 'mouseup,dragend', 'mouseup should occur before dragend 14');
assert(!Kinetic.isDragging(), ' isDragging() should be false 15');
assert(!Kinetic.isDragReady(), ' isDragReady()) should be false 16');
assert(!Konva.isDragging(), ' isDragging() should be false 15');
assert(!Konva.isDragReady(), ' isDragReady()) should be false 16');
//console.log(greenCircle.getPosition());
//console.log(circle.getPosition());
@@ -139,9 +139,9 @@ suite('DragAndDropEvents', function() {
// ======================================================
test('destroy shape while dragging', function(done) {
var stage = addStage();
var layer = new Kinetic.Layer();
var layer = new Konva.Layer();
var greenCircle = new Kinetic.Circle({
var greenCircle = new Konva.Circle({
x: 40,
y: 40,
radius: 20,
@@ -152,7 +152,7 @@ suite('DragAndDropEvents', function() {
});
var circle = new Kinetic.Circle({
var circle = new Konva.Circle({
x: 380,
y: stage.getHeight() / 2,
radius: 70,
@@ -187,8 +187,8 @@ suite('DragAndDropEvents', function() {
events.push('mouseup');
});
assert(!Kinetic.isDragging(), ' isDragging() should be false');
assert(!Kinetic.isDragReady(), ' isDragReady()) should be false');
assert(!Konva.isDragging(), ' isDragging() should be false');
assert(!Konva.isDragReady(), ' isDragReady()) should be false');
stage._mousedown({
@@ -226,9 +226,9 @@ suite('DragAndDropEvents', function() {
// ======================================================
test('click should not occur after drag and drop', function(done) {
var stage = addStage();
var layer = new Kinetic.Layer();
var layer = new Konva.Layer();
var circle = new Kinetic.Circle({
var circle = new Konva.Circle({
x: 40,
y: 40,
radius: 20,
@@ -265,12 +265,12 @@ suite('DragAndDropEvents', function() {
clientY: 100 + top
});
Kinetic.DD._endDragBefore();
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 100,
clientY: 100 + top
});
Kinetic.DD._endDragAfter({dragEndNode:circle});
Konva.DD._endDragAfter({dragEndNode:circle});
assert(!clicked, 'click event should not have been fired');
@@ -282,9 +282,9 @@ suite('DragAndDropEvents', function() {
// ======================================================
test('drag and drop distance', function(done) {
var stage = addStage();
var layer = new Kinetic.Layer();
var layer = new Konva.Layer();
var circle = new Kinetic.Circle({
var circle = new Konva.Circle({
x: 40,
y: 40,
radius: 20,
@@ -316,12 +316,12 @@ suite('DragAndDropEvents', function() {
clientY: 45 + top
});
assert(circle.isDragging(), 'now circle is dragging');
Kinetic.DD._endDragBefore();
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 41,
clientY: 45 + top
});
Kinetic.DD._endDragAfter({dragEndNode:circle});
Konva.DD._endDragAfter({dragEndNode:circle});
@@ -333,8 +333,8 @@ suite('DragAndDropEvents', function() {
// ======================================================
test('cancel drag and drop by setting draggable to false', function(done) {
var stage = addStage();
var layer = new Kinetic.Layer();
var circle = new Kinetic.Circle({
var layer = new Konva.Layer();
var circle = new Konva.Circle({
x: 380,
y: 100,
radius: 70,
@@ -383,12 +383,12 @@ suite('DragAndDropEvents', function() {
clientY: 100 + top
});
Kinetic.DD._endDragBefore();
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 100,
clientY: 100 + top
});
Kinetic.DD._endDragAfter({dragEndNode:circle});
Konva.DD._endDragAfter({dragEndNode:circle});
assert.equal(circle.getPosition().x, 380, 'circle x should be 380');
assert.equal(circle.getPosition().y, 100, 'circle y should be 100');
@@ -399,7 +399,7 @@ suite('DragAndDropEvents', function() {
// ======================================================
test('drag and drop layer', function(done) {
var stage = addStage();
var layer = new Kinetic.Layer({
var layer = new Konva.Layer({
drawFunc: function() {
var context = this.getContext();
context.beginPath();
@@ -413,14 +413,14 @@ suite('DragAndDropEvents', function() {
draggable: true
});
var circle1 = new Kinetic.Circle({
var circle1 = new Konva.Circle({
x: stage.getWidth() / 2,
y: stage.getHeight() / 2,
radius: 70,
fill: 'red'
});
var circle2 = new Kinetic.Circle({
var circle2 = new Konva.Circle({
x: 400,
y: stage.getHeight() / 2,
radius: 70,
@@ -448,12 +448,12 @@ suite('DragAndDropEvents', function() {
clientY: 109 + top
});
Kinetic.DD._endDragBefore();
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 210,
clientY: 109 + top
});
Kinetic.DD._endDragAfter({dragEndNode:circle2});
Konva.DD._endDragAfter({dragEndNode:circle2});
//console.log(layer.getPosition())
@@ -468,20 +468,20 @@ suite('DragAndDropEvents', function() {
// ======================================================
test('drag and drop stage', function(done) {
var container = document.createElement('div'),
stage = new Kinetic.Stage({
stage = new Konva.Stage({
container: container,
width: 578,
height: 200,
draggable: true
});
kineticContainer.appendChild(container);
konvaContainer.appendChild(container);
//stage.setDraggable(true);
var layer = new Kinetic.Layer();
var layer = new Konva.Layer();
var circle = new Kinetic.Circle({
var circle = new Konva.Circle({
x: 100,
y: 100,
radius: 70,
@@ -510,12 +510,12 @@ suite('DragAndDropEvents', function() {
clientY: 110 + top
});
Kinetic.DD._endDragBefore();
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 300,
clientY: 110 + top
});
Kinetic.DD._endDragAfter();
Konva.DD._endDragAfter();
assert.equal(stage.getX(), 300);
assert.equal(stage.getY(), 10);

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

@@ -1,14 +1,14 @@
suite('MouseEvents', function() {
// NOTE: disable throttling so these tests can run synchronously
Kinetic.enableThrottling = false;
Konva.enableThrottling = false;
// ======================================================
test('stage content mouse events', function(done) {
var stage = addStage();
var layer = new Kinetic.Layer();
var circle = new Kinetic.Circle({
var layer = new Konva.Layer();
var circle = new Konva.Circle({
x: 100,
y: 100,
radius: 70,
@@ -149,9 +149,9 @@ suite('MouseEvents', function() {
var top = stage.content.getBoundingClientRect().top;
var layer = new Kinetic.Layer();
var layer = new Konva.Layer();
var circle = new Kinetic.Circle({
var circle = new Konva.Circle({
x: stage.getWidth() / 2,
y: stage.getHeight() / 2,
radius: 70,
@@ -179,12 +179,12 @@ suite('MouseEvents', function() {
clientY: 112 + top
});
Kinetic.DD._endDragBefore();
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 291,
clientY: 112 + top
});
Kinetic.DD._endDragAfter({dragEndNode:circle});
Konva.DD._endDragAfter({dragEndNode:circle});
});
// ======================================================
@@ -193,9 +193,9 @@ suite('MouseEvents', function() {
var top = stage.content.getBoundingClientRect().top;
var layer = new Kinetic.Layer();
var layer = new Konva.Layer();
var circle = new Kinetic.Circle({
var circle = new Konva.Circle({
x: stage.getWidth() / 2,
y: stage.getHeight() / 2,
radius: 70,
@@ -219,7 +219,7 @@ suite('MouseEvents', function() {
clientX: 291,
clientY: 112 + top
});
Kinetic.DD._endDragBefore();
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 291,
clientY: 112 + top
@@ -232,7 +232,7 @@ suite('MouseEvents', function() {
clientX: 291,
clientY: 112 + top
});
Kinetic.DD._endDragBefore();
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 291,
clientY: 112 + top
@@ -245,7 +245,7 @@ suite('MouseEvents', function() {
clientX: 291,
clientY: 112 + top
});
Kinetic.DD._endDragBefore();
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 291,
clientY: 112 + top
@@ -257,7 +257,7 @@ suite('MouseEvents', function() {
// ======================================================
test('click mapping', function() {
var stage = addStage();
var layer = new Kinetic.Layer({
var layer = new Konva.Layer({
drawFunc: function() {
var context = this.getContext();
context.beginPath();
@@ -270,14 +270,14 @@ suite('MouseEvents', function() {
}
});
var redCircle = new Kinetic.Circle({
var redCircle = new Konva.Circle({
x: stage.getWidth() / 2,
y: stage.getHeight() / 2,
radius: 70,
fill: 'red'
});
var greenCircle = new Kinetic.Circle({
var greenCircle = new Konva.Circle({
x: 400,
y: stage.getHeight() / 2,
radius: 70,
@@ -312,12 +312,12 @@ suite('MouseEvents', function() {
clientY: 113 + top
});
Kinetic.DD._endDragBefore();
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 284,
clientY: 113 + top
});
Kinetic.DD._endDragAfter({dragEndNode:redCircle});
Konva.DD._endDragAfter({dragEndNode:redCircle});
assert.equal(redClicks, 1, 'red circle should have 1 click');
assert.equal(greenClicks, 0, 'green circle should have 0 clicks');
@@ -328,12 +328,12 @@ suite('MouseEvents', function() {
clientY: 108 + top
});
Kinetic.DD._endDragBefore();
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 397,
clientY: 108 + top
});
Kinetic.DD._endDragAfter({dragEndNode:redCircle});
Konva.DD._endDragAfter({dragEndNode:redCircle});
assert.equal(redClicks, 1, 'red circle should have 1 click');
assert.equal(greenClicks, 1, 'green circle should have 1 click');
@@ -344,12 +344,12 @@ suite('MouseEvents', function() {
clientY: 113 + top
});
Kinetic.DD._endDragBefore();
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 397,
clientY: 108 + top
});
Kinetic.DD._endDragAfter({dragEndNode:redCircle});
Konva.DD._endDragAfter({dragEndNode:redCircle});
assert.equal(redClicks, 1, 'red circle should still have 1 click');
assert.equal(greenClicks, 1, 'green circle should still have 1 click');
@@ -359,8 +359,8 @@ suite('MouseEvents', function() {
// ======================================================
test('text events', function() {
var stage = addStage();
var layer = new Kinetic.Layer();
var text = new Kinetic.Text({
var layer = new Konva.Layer();
var text = new Konva.Text({
x: 290,
y: 111,
fontFamily: 'Calibri',
@@ -389,12 +389,12 @@ suite('MouseEvents', function() {
clientY: 120 + top
});
Kinetic.DD._endDragBefore();
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 300,
clientY: 120 + top
});
Kinetic.DD._endDragAfter({dragEndNode:text});
Konva.DD._endDragAfter({dragEndNode:text});
//TODO: can't get this to pass
assert.equal(click, true, 'click event should have been fired when mousing down and then up on text');
@@ -404,10 +404,10 @@ suite('MouseEvents', function() {
// ======================================================
test('modify fill stroke and stroke width on hover with circle', function(done) {
var stage = addStage();
var layer = new Kinetic.Layer({
var layer = new Konva.Layer({
throttle: 999
});
var circle = new Kinetic.Circle({
var circle = new Konva.Circle({
x: 380,
y: stage.getHeight() / 2,
radius: 70,
@@ -467,8 +467,8 @@ suite('MouseEvents', function() {
// ======================================================
test('mousedown mouseup mouseover mouseout mousemove click dblclick', function(done) {
var stage = addStage();
var layer = new Kinetic.Layer();
var circle = new Kinetic.Circle({
var layer = new Konva.Layer();
var circle = new Konva.Circle({
x: stage.getWidth() / 2,
y: stage.getHeight() / 2,
radius: 70,
@@ -636,10 +636,10 @@ suite('MouseEvents', function() {
// ======================================================
test('test group mousedown events', function() {
var stage = addStage();
var layer = new Kinetic.Layer();
var group = new Kinetic.Group();
var layer = new Konva.Layer();
var group = new Konva.Group();
var redCircle = new Kinetic.Circle({
var redCircle = new Konva.Circle({
x: stage.getWidth() / 2,
y: stage.getHeight() / 2,
radius: 80,
@@ -649,7 +649,7 @@ suite('MouseEvents', function() {
name: 'red'
});
var greenCircle = new Kinetic.Circle({
var greenCircle = new Konva.Circle({
x: stage.getWidth() / 2,
y: stage.getHeight() / 2,
radius: 40,
@@ -715,10 +715,10 @@ suite('MouseEvents', function() {
// ======================================================
test('test mousedown events with antialiasing', function() {
var stage = addStage();
var layer = new Kinetic.Layer();
var group = new Kinetic.Group();
var layer = new Konva.Layer();
var group = new Konva.Group();
var greenCircle = new Kinetic.Circle({
var greenCircle = new Konva.Circle({
x: 50,
y: 50,
radius: 50,
@@ -755,8 +755,8 @@ suite('MouseEvents', function() {
// ======================================================
test('group mouseenter events', function(done) {
var stage = addStage();
var layer = new Kinetic.Layer();
var group = new Kinetic.Group({
var layer = new Konva.Layer();
var group = new Konva.Group({
name: 'group'
});
@@ -767,7 +767,7 @@ suite('MouseEvents', function() {
var groupMouseenters = 0;
var groupMouseleaves = 0;
var redCircle = new Kinetic.Circle({
var redCircle = new Konva.Circle({
x: stage.getWidth() / 2,
y: stage.getHeight() / 2,
radius: 80,
@@ -777,7 +777,7 @@ suite('MouseEvents', function() {
name: 'red'
});
var greenCircle = new Kinetic.Circle({
var greenCircle = new Konva.Circle({
x: stage.getWidth() / 2,
y: stage.getHeight() / 2,
radius: 40,
@@ -915,11 +915,11 @@ suite('MouseEvents', function() {
// ======================================================
test('test mouseleave with multiple groups', function() {
var stage = addStage();
var layer = new Kinetic.Layer({
var layer = new Konva.Layer({
id : 'layer'
});
var rect1 = new Kinetic.Rect({
var rect1 = new Konva.Rect({
x:0,
y:0,
width: 100,
@@ -928,7 +928,7 @@ suite('MouseEvents', function() {
id : 'redRect'
});
var rect2 = new Kinetic.Rect({
var rect2 = new Konva.Rect({
x:50,
y:0,
width: 70,
@@ -938,10 +938,10 @@ suite('MouseEvents', function() {
id : 'greenRect'
});
var group = new Kinetic.Group({
var group = new Konva.Group({
id : 'group1'
});
var group2 = new Kinetic.Group({
var group2 = new Konva.Group({
id : 'group2'
});
group.add(rect1);
@@ -1061,8 +1061,8 @@ suite('MouseEvents', function() {
// ======================================================
test('test event bubbling', function() {
var stage = addStage();
var layer = new Kinetic.Layer();
var circle = new Kinetic.Circle({
var layer = new Konva.Layer();
var circle = new Konva.Circle({
x: 380,
y: stage.getHeight() / 2,
radius: 70,
@@ -1072,8 +1072,8 @@ suite('MouseEvents', function() {
id: 'myCircle'
});
var group1 = new Kinetic.Group();
var group2 = new Kinetic.Group();
var group1 = new Konva.Group();
var group2 = new Konva.Group();
/*
* stage
@@ -1120,12 +1120,12 @@ suite('MouseEvents', function() {
clientX: 374,
clientY: 114 + top
});
Kinetic.DD._endDragBefore();
Konva.DD._endDragBefore();
stage._mouseup({
clientX: 374,
clientY: 114 + top
});
Kinetic.DD._endDragAfter({dragEndNode:circle});
Konva.DD._endDragAfter({dragEndNode:circle});
assert.equal(e.toString(), 'circle,group1,group2,layer,stage', 'problem with event bubbling');
@@ -1134,8 +1134,8 @@ suite('MouseEvents', function() {
// ======================================================
test('test custom circle hit function', function(done) {
var stage = addStage();
var layer = new Kinetic.Layer();
var circle = new Kinetic.Circle({
var layer = new Konva.Layer();
var circle = new Konva.Circle({
x: 380,
y: stage.getHeight() / 2,
radius: 70,

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

@@ -3,8 +3,8 @@ suite('TouchEvents', function() {
// ======================================================
test('stage content touch events', function() {
var stage = addStage();
var layer = new Kinetic.Layer();
var circle = new Kinetic.Circle({
var layer = new Konva.Layer();
var circle = new Konva.Circle({
x: 100,
y: 100,
radius: 70,
@@ -94,8 +94,8 @@ suite('TouchEvents', function() {
// ======================================================
test('touchstart touchend touchmove tap dbltap', function(done) {
var stage = addStage();
var layer = new Kinetic.Layer();
var circle = new Kinetic.Circle({
var layer = new Konva.Layer();
var circle = new Konva.Circle({
x: stage.getWidth() / 2,
y: stage.getHeight() / 2,
radius: 70,
@@ -149,7 +149,7 @@ suite('TouchEvents', function() {
var top = stage.content.getBoundingClientRect().top;
// reset inDoubleClickWindow
Kinetic.inDblClickWindow = false;
Konva.inDblClickWindow = false;
// touchstart circle
stage._touchstart({
@@ -175,7 +175,7 @@ suite('TouchEvents', function() {
});
// end drag is tied to document mouseup and touchend event
// which can't be simulated. call _endDrag manually
//Kinetic.DD._endDrag();
//Konva.DD._endDrag();
assert(touchstart, '9) touchstart should be true');
assert(!touchmove, '9) touchmove should be false');
@@ -207,7 +207,7 @@ suite('TouchEvents', function() {
});
// end drag is tied to document mouseup and touchend event
// which can't be simulated. call _endDrag manually
//Kinetic.DD._endDrag();
//Konva.DD._endDrag();
assert(touchstart, '11) touchstart should be true');
assert(!touchmove, '11) touchmove should be false');