lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-06-28 15:23:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

some code and comments fixes

Browse Source
This commit is contained in:
Anton Lavrenov 2019-01-14 13:29:24 -05:00
parent 60e425c596
commit 5ebef8ef6e
3 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Shape.ts
View File

@ -216,6 +216,8 @@ export class Shape extends Node {
delete shapes[this.colorKey];
return this;
}
// TODO: write why do we need it,
// try to use it without stage (use global buffer canvas)
_useBufferCanvas(caching) {
return (
(!caching &&

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

@ -123,7 +123,7 @@ suite('Node', function() {
var called = false;
Konva.Util.warn = function() {
called = true;
}
};
var circle = new Konva.Circle({
id: 'circle'
});
@ -132,7 +132,7 @@ suite('Node', function() {
});
assert.equal(called, true);
Konva.Util.warn = oldWarn;
})
});
// ======================================================
test('transform cache', function() {
@ -456,12 +456,12 @@ suite('Node', function() {
// ======================================================
test('test offset attr change', function() {
/*
* the premise of this test to make sure that only
* root level attributes trigger an attr change event.
* for this test, we have two offset properties. one
* is in the root level, and the other is inside the shadow
* object
*/
* the premise of this test to make sure that only
* root level attributes trigger an attr change event.
* for this test, we have two offset properties. one
* is in the root level, and the other is inside the shadow
* object
*/
var stage = addStage();
var layer = new Konva.Layer();
var rect = new Konva.Rect({
@ -582,9 +582,9 @@ suite('Node', function() {
clone.setShadowColor('green');
/*
* Make sure that when we change a clone object attr that the rect object
* attr isn't updated by reference
*/
* Make sure that when we change a clone object attr that the rect object
* attr isn't updated by reference
*/
assert.equal(rect.getShadowColor(), 'black');
assert.equal(clone.getShadowColor(), 'green');
@ -1154,18 +1154,18 @@ suite('Node', function() {
stage.add(layer);
/*
* add custom attr that points to self. The setAttrs method should
* not inifinitely recurse causing a stack overflow
*/
* add custom attr that points to self. The setAttrs method should
* not inifinitely recurse causing a stack overflow
*/
circle.setAttrs({
self: circle
});
/*
* serialize the stage. The json should succeed because objects that have
* methods, such as self, are not serialized, and will therefore avoid
* circular json errors.
*/
* serialize the stage. The json should succeed because objects that have
* methods, such as self, are not serialized, and will therefore avoid
* circular json errors.
*/
var json = stage.toJSON();
});
@ -1665,7 +1665,7 @@ suite('Node', function() {
var stage = addStage();
var layer = new Konva.Layer({
name: 'layerName',
name: 'layerName'
});
var group = new Konva.Group({
name: 'groupName',
@ -1681,7 +1681,7 @@ suite('Node', function() {
width: side,
height: side,
fill: 'red',
name: 'rectName',
name: 'rectName'
});
var marker = new Konva.Rect({
x: side,
@ -1737,7 +1737,7 @@ suite('Node', function() {
width: 50,
height: 50,
fill: 'red',
name: 'rectName',
name: 'rectName'
});
group.add(rect);
@ -1988,8 +1988,8 @@ suite('Node', function() {
});
/*
* test regular on and off
*/
* test regular on and off
*/
assert.equal(circle.eventListeners['click'], undefined);
circle.on('click', function() {});
@ -2002,8 +2002,8 @@ suite('Node', function() {
assert.equal(circle.eventListeners['click'], undefined);
/*
* test name spacing
*/
* test name spacing
*/
circle.on('click.foo', function() {});
assert.equal(circle.eventListeners['click'].length, 1);
@ -2019,8 +2019,8 @@ suite('Node', function() {
assert.equal(circle.eventListeners['click'], undefined);
/*
* test remove all events in name space
*/
* test remove all events in name space
*/
circle.on('click.foo', function() {});
circle.on('click.foo', function() {});
circle.on('touch.foo', function() {});
@ -2402,22 +2402,22 @@ suite('Node', function() {
});
/*
* Stage(0)
* |
* Layer(1)
* |
* +-----+-----+
* | |
* G1(2) G2(3)
* | |
* + +---+---+
* | | |
* S1(4) G3(5) G4(6)
* |
* +
* |
* S2(7)
*/
* Stage(0)
* |
* Layer(1)
* |
* +-----+-----+
* | |
* G1(2) G2(3)
* | |
* + +---+---+
* | | |
* S1(4) G3(5) G4(6)
* |
* +
* |
* S2(7)
*/
group1.add(shape1);
group2.add(group3);

3
test/unit/shapes/Text-test.js
View File

@ -518,8 +518,6 @@ suite('Text', function() {
});
// ======================================================
// skiping this test for now. It fails on travis. WHYYY??!?!?!
// TODO: restore it
test('text multi line with underline and spacing', function() {
var stage = addStage();
var layer = new Konva.Layer();
@ -541,7 +539,6 @@ suite('Text', function() {
var trace =
'clearRect(0,0,578,200);save();transform(1,0,0,1,10,10);font=normal normal 80px Arial;textBaseline=middle;textAlign=left;translate(0,40);save();save();beginPath();moveTo(0,40);lineTo(189,40);stroke();restore();fillStyle=red;fillText(h,0,0);translate(49,0);fillStyle=red;fillText(e,0,0);translate(49,0);fillStyle=red;fillText(l,0,0);translate(23,0);fillStyle=red;fillText(l,0,0);translate(23,0);fillStyle=red;fillText(o,0,0);translate(49,0);restore();translate(0,80);save();save();beginPath();moveTo(0,40);lineTo(211,40);stroke();restore();fillStyle=red;fillText(w,0,0);translate(63,0);fillStyle=red;fillText(o,0,0);translate(49,0);fillStyle=red;fillText(r,0,0);translate(32,0);fillStyle=red;fillText(l,0,0);translate(23,0);fillStyle=red;fillText(d,0,0);translate(49,0);restore();translate(0,80);restore();';
// console.log(layer.getContext().getTrace());
assert.equal(layer.getContext().getTrace(), trace);
});