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

Merge branch 'master' of github.com:konvajs/konva

Browse Source
This commit is contained in:
Anton Lavrenov
2019-02-18 12:18:16 -05:00
parent 40cf5a5909 6b745892e5
commit 7b22a7ae50
11 changed files with 92 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/unit/Node-cache-test.js
View File

@@ -210,8 +210,8 @@ suite('Caching', function() {
context.shadowBlur = 10;
context.fill();
showCanvas(rect._cache.canvas.scene._canvas);
showCanvas(rect._cache.canvas.hit._canvas);
showCanvas(rect._getCanvasCache().scene._canvas);
showCanvas(rect._getCanvasCache().hit._canvas);
showHit(layer);
compareLayerAndCanvas(layer, canvas, 10);
Konva.pixelRatio = undefined;
@@ -596,7 +596,7 @@ suite('Caching', function() {
layer.add(group);
stage.add(layer);
assert.equal(circle._cache.canvas, undefined);
assert.equal(circle._getCanvasCache(), undefined);
var canvas = createCanvas();
var context = canvas.getContext('2d');

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

@@ -150,17 +150,17 @@ suite('Node', function() {
strokeWidth: 4
});
assert.equal(circle._cache.transform, undefined);
assert.equal(circle._cache.get('transform'), undefined);
layer.add(circle);
stage.add(layer);
// transform cache
assert.notEqual(circle._cache.transform, undefined);
assert.notEqual(circle._cache.get('transform'), undefined);
circle.setX(100);
assert.equal(circle._cache.transform, undefined);
assert.equal(circle._cache.get('transform'), undefined);
layer.draw();
assert.notEqual(circle._cache.transform, undefined);
assert.notEqual(circle._cache.get('transform'), undefined);
});
// ======================================================
@@ -179,15 +179,15 @@ suite('Node', function() {
stage.add(layer);
// visible cache
assert.equal(circle._cache.visible, true);
assert.equal(circle._cache.get('visible'), true);
circle.hide();
assert.equal(circle._cache.visible, undefined);
assert.equal(circle._cache.get('visible'), undefined);
stage.draw();
assert.equal(circle._cache.visible, false);
assert.equal(circle._cache.get('visible'), false);
circle.show();
assert.equal(circle._cache.visible, undefined);
assert.equal(circle._cache.get('visible'), undefined);
layer.draw();
assert.equal(circle._cache.visible, true);
assert.equal(circle._cache.get('visible'), true);
});
// ======================================================
@@ -206,14 +206,14 @@ suite('Node', function() {
stage.add(layer);
// shadow cache
assert.equal(circle._cache.hasShadow, false);
assert.equal(circle._cache.get('hasShadow'), false);
circle.setShadowColor('red');
circle.setShadowOffset(10);
assert.equal(circle._cache.hasShadow, undefined);
assert.equal(circle._cache.get('hasShadow'), undefined);
layer.draw();
assert.equal(circle._cache.hasShadow, true);
assert.equal(circle._cache.get('hasShadow'), true);
layer.draw();
assert.equal(circle._cache.hasShadow, true);
assert.equal(circle._cache.get('hasShadow'), true);
});
// ======================================================
@@ -255,11 +255,11 @@ suite('Node', function() {
stage.add(layer);
// opacity cache
assert.equal(circle._cache.absoluteOpacity, 1);
assert.equal(circle._cache.get('absoluteOpacity'), 1);
circle.setOpacity(0.5);
assert.equal(circle._cache.absoluteOpacity, undefined);
assert.equal(circle._cache.get('absoluteOpacity'), undefined);
layer.draw();
assert.equal(circle._cache.absoluteOpacity, 0.5);
assert.equal(circle._cache.get('absoluteOpacity'), 0.5);
});
// ======================================================
@@ -282,11 +282,11 @@ suite('Node', function() {
// prime the cache
circle.isListening();
assert.equal(circle._cache.listening, true);
assert.equal(circle._cache.get('listening'), true);
circle.setListening(false);
assert.equal(circle._cache.listening, undefined);
assert.equal(circle._cache.get('listening'), undefined);
circle.isListening();
assert.equal(circle._cache.listening, false);
assert.equal(circle._cache.get('listening'), false);
});
// ======================================================
@@ -306,7 +306,7 @@ suite('Node', function() {
// stage cache
var st = circle.getStage();
assert.equal(circle._cache.stage._id, stage._id);
assert.equal(circle._cache.get('stage')._id, stage._id);
});
// ======================================================
@@ -3405,7 +3405,7 @@ suite('Node', function() {
layer.add(group);
stage.add(layer);
assert.equal(circle._cache.canvas, undefined);
assert.equal(circle._getCanvasCache(), undefined);
circle
.cache({
@@ -3419,19 +3419,19 @@ suite('Node', function() {
y: 74
});
assert.notEqual(circle._cache.canvas.scene, undefined);
assert.notEqual(circle._cache.canvas.hit, undefined);
assert.notEqual(circle._getCanvasCache().scene, undefined);
assert.notEqual(circle._getCanvasCache().hit, undefined);
layer.draw();
//document.body.appendChild(circle._cache.canvas.scene._canvas);
// document.body.appendChild(circle._cache.canvas.hit._canvas);
//document.body.appendChild(circle._getCanvasCache().scene._canvas);
// document.body.appendChild(circle._getCanvasCache().hit._canvas);
showHit(layer);
//assert.equal(layer.getContext().getTrace(), 'clearRect(0,0,578,200);save();transform(1,0,0,1,74,74);beginPath();arc(0,0,70,0,6.283,false);closePath();fillStyle=green;fill();lineWidth=4;strokeStyle=black;stroke();restore();clearRect(0,0,578,200);save();transform(1,0,0,1,0,0);drawImage([object HTMLCanvasElement],0,0);restore();');
//assert.equal(circle._cache.canvas.scene.getContext().getTrace(), 'save();translate(74,74);beginPath();arc(0,0,70,0,6.283,false);closePath();fillStyle=green;fill();lineWidth=4;strokeStyle=black;stroke();restore();');
//assert.equal(circle._getCanvasCache().scene.getContext().getTrace(), 'save();translate(74,74);beginPath();arc(0,0,70,0,6.283,false);closePath();fillStyle=green;fill();lineWidth=4;strokeStyle=black;stroke();restore();');
});
test('cache shape before adding to layer', function() {
@@ -3457,7 +3457,7 @@ suite('Node', function() {
});
group.add(rect);
assert.equal(rect._cache.canvas, undefined);
assert.equal(rect._getCanvasCache(), undefined);
group.cache({
x: 0,
y: 0,
@@ -3466,8 +3466,8 @@ suite('Node', function() {
});
stage.add(layer);
assert(group._cache.canvas.scene);
assert(group._cache.canvas.hit);
assert(group._getCanvasCache().scene);
assert(group._getCanvasCache().hit);
layer.add(group);
layer.draw();

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

@@ -904,7 +904,7 @@ suite('Shape', function() {
lion.cache();
//document.body.appendChild(lion._cache.canvas.hit._canvas);
//document.body.appendChild(lion._getCanvasCache().hit._canvas);
lion.drawHitFromCache();

8
test/unit/filters/Blur-test.js
View File

@@ -108,7 +108,7 @@ suite('Blur', function() {
layer.draw();
//document.body.appendChild(group._cache.canvas.hit._canvas);
//document.body.appendChild(group._getCanvasCache().hit._canvas);
//showHit(layer);
});
@@ -293,11 +293,11 @@ suite('Blur', function() {
darth.drawHitFromCache(100);
layer.draw();
showCanvas(darth._cache.canvas.hit._canvas);
showCanvas(darth._getCanvasCache().hit._canvas);
//console.log(darth._cache.canvas.hit.getContext().getTrace());
//console.log(darth._getCanvasCache().hit.getContext().getTrace());
//assert.equal(darth._cache.canvas.hit.getContext().getTrace(true), 'save();translate();beginPath();rect();closePath();save();fillStyle;fill();restore();restore();clearRect();getImageData();putImageData();');
//assert.equal(darth._getCanvasCache().hit.getContext().getTrace(true), 'save();translate();beginPath();rect();closePath();save();fillStyle;fill();restore();restore();clearRect();getImageData();putImageData();');
done();
};

4
test/unit/shapes/Transformer-test.js
View File

@@ -1294,7 +1294,7 @@ suite('Transformer', function() {
layer.draw();
assert.equal(tr._cache.transform.m[4], 50);
assert.equal(tr._cache.get('transform').m[4], 50);
var rect = new Konva.Rect({
x: 50,
@@ -1308,7 +1308,7 @@ suite('Transformer', function() {
tr.forceUpdate();
layer.draw();
assert.equal(tr._cache.transform.m[4], 100);
assert.equal(tr._cache.get('transform').m[4], 100);
// tr._fitNodeInto({
// x: 100,