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

prettier, build

Browse Source
This commit is contained in:
Anton Lavrenov 2018-07-24 11:07:13 +07:00
parent a6d3426de9
commit 40416a0cee
4 changed files with 69 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
konva.js
View File

@ -2,7 +2,7 @@
* Konva JavaScript Framework v2.1.7
* http://konvajs.github.io/
* Licensed under the MIT
* Date: Fri Jul 20 2018
* Date: Tue Jul 24 2018
*
* Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
* Modified work Copyright (C) 2014 - present by Anton Lavrenov (Konva)
@ -3800,17 +3800,19 @@
}
},
_getAbsoluteTransform: function(top) {
var at = new Konva.Transform(),
transformsEnabled;
var at = new Konva.Transform();
// start with stage and traverse downwards to self
this._eachAncestorReverse(function(node) {
transformsEnabled = node.transformsEnabled();
var transformsEnabled = node.transformsEnabled();
if (transformsEnabled === 'all') {
at.multiply(node.getTransform());
} else if (transformsEnabled === 'position') {
at.translate(node.x(), node.y());
at.translate(
node.getX() - node.getOffsetX(),
node.getY() - node.getOffsetY()
);
}
}, top);
return at;

4
konva.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
src/Node.js
View File

@ -1436,7 +1436,10 @@
if (transformsEnabled === 'all') {
at.multiply(node.getTransform());
} else if (transformsEnabled === 'position') {
at.translate(node.getX() - node.getOffsetX(), node.getY() - node.getOffsetY());
at.translate(
node.getX() - node.getOffsetX(),
node.getY() - node.getOffsetY()
);
}
}, top);
return at;

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

@ -1695,62 +1695,68 @@ suite('Node', function() {
});
// ======================================================
test('results of getAbsoluteTransform limited to position and offset transformations are the same' +
' when used with transformsEnabled = \'all\' and transformsEnabled = \'position\'', function() {
var stage = addStage();
var layer1 = new Konva.Layer({
name: 'layerName',
id: 'layerId',
x: 90,
y: 110,
offsetX: 50,
offsetY: 50,
transformsEnabled: 'all'
});
var group1 = new Konva.Group({
name: 'groupName',
id: 'groupId',
x: 30,
y: 30,
offsetX: -60,
offsetY: -80,
transformsEnabled: 'all'
});
var rect1 = new Konva.Rect({
x: -50,
y: -60,
offsetX: 50,
offsetY: 50,
width: 50,
height: 50,
fill: 'red',
name: 'rectName',
id: 'rectId1',
transformsEnabled: 'all'
});
test(
'results of getAbsoluteTransform limited to position and offset transformations are the same' +
" when used with transformsEnabled = 'all' and transformsEnabled = 'position'",
function() {
var stage = addStage();
var layer1 = new Konva.Layer({
name: 'layerName',
id: 'layerId',
x: 90,
y: 110,
offsetX: 50,
offsetY: 50,
transformsEnabled: 'all'
});
var group1 = new Konva.Group({
name: 'groupName',
id: 'groupId',
x: 30,
y: 30,
offsetX: -60,
offsetY: -80,
transformsEnabled: 'all'
});
var rect1 = new Konva.Rect({
x: -50,
y: -60,
offsetX: 50,
offsetY: 50,
width: 50,
height: 50,
fill: 'red',
name: 'rectName',
id: 'rectId1',
transformsEnabled: 'all'
});
var layer2 = layer1.clone({ transformsEnabled: 'position' });
var group2 = group1.clone({ transformsEnabled: 'position' });
var rect2 = rect1.clone({ transformsEnabled: 'position' });
var layer2 = layer1.clone({ transformsEnabled: 'position' });
var group2 = group1.clone({ transformsEnabled: 'position' });
var rect2 = rect1.clone({ transformsEnabled: 'position' });
group1.add(rect1);
layer1.add(group1);
stage.add(layer1);
group1.add(rect1);
layer1.add(group1);
stage.add(layer1);
group2.add(rect2);
layer2.add(group2);
stage.add(layer2);
group2.add(rect2);
layer2.add(group2);
stage.add(layer2);
assert.equal(layer1.getTransformsEnabled(), 'all');
assert.equal(group1.getTransformsEnabled(), 'all');
assert.equal( rect1.getTransformsEnabled(), 'all');
assert.equal(layer1.getTransformsEnabled(), 'all');
assert.equal(group1.getTransformsEnabled(), 'all');
assert.equal(rect1.getTransformsEnabled(), 'all');
assert.equal(layer2.getTransformsEnabled(), 'position');
assert.equal(group2.getTransformsEnabled(), 'position');
assert.equal( rect2.getTransformsEnabled(), 'position');
assert.equal(layer2.getTransformsEnabled(), 'position');
assert.equal(group2.getTransformsEnabled(), 'position');
assert.equal(rect2.getTransformsEnabled(), 'position');
assert.deepEqual(rect2.getAbsoluteTransform(), rect1.getAbsoluteTransform());
});
assert.deepEqual(
rect2.getAbsoluteTransform(),
rect1.getAbsoluteTransform()
);
}
);
// ======================================================
test('test dragDistance', function() {