lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2026-01-08 18:54:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved transformsEnabled logic and added tests

Browse Source
This commit is contained in:
Eric Rowell
2013-12-11 22:34:02 -08:00
parent cd1ae9141e
commit f31254bb87
3 changed files with 60 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Context.js
View File

@@ -227,14 +227,7 @@
var m;
if (shape.isTransformsEnabled()) {
if (shape.isAncestorTransformsEnabled()) {
// poor performance
m = shape.getAbsoluteTransform().getMatrix();
}
else {
// better performance
m = shape.getTransform().getMatrix();
}
m = shape.getAbsoluteTransform().getMatrix();
this.transform(m[0], m[1], m[2], m[3], m[4], m[5]);
}
else {

50
src/Node.js
View File

@@ -32,7 +32,8 @@
'skewYChange.kinetic',
'rotationChange.kinetic',
'offsetXChange.kinetic',
'offsetYChange.kinetic'
'offsetYChange.kinetic',
'transformsEnabledChange.kinetic'
].join(SPACE);
Kinetic.Util.addMethods(Kinetic.Node, {
@@ -974,8 +975,10 @@
m;
this._eachAncestorReverse(function(node) {
m = node.getTransform();
am.multiply(m);
if (node.isTransformsEnabled()) {
m = node.getTransform();
am.multiply(m);
}
}, true);
return am;
},
@@ -1365,26 +1368,6 @@
this.drawHit();
return this;
},
/**
* enable ancestor transforms
* @method
* @memberof Kinetic.Node.prototype
* @returns {Node}
*/
enableAncestorTransforms: function() {
this.setAncestorTransformsEnabled(true);
return this;
},
/**
* disable ancestor transforms
* @method
* @memberof Kinetic.Node.prototype
* @returns {Node}
*/
disableAncestorTransforms: function() {
this.setAncestorTransformsEnabled(false);
return this;
},
/**
* enable transforms
* @method
@@ -1803,27 +1786,6 @@
* @returns {Boolean}
*/
Kinetic.Factory.addGetterSetter(Kinetic.Node, 'ancestorTransformsEnabled', true);
/**
* enable/disable ancestor transforms
* @name setAncestorTransformsEnabled
* @method
* @memberof Kinetic.Node.prototype
* @param {Boolean} enabled
* @returns {Node}
*/
/**
* determine if ancestor transforms are enabled
* @name getAncestorTransformsEnabled
* @method
* @memberof Kinetic.Node.prototype
* @returns {Boolean}
*/
Kinetic.Node.prototype.isAncestorTransformsEnabled = Kinetic.Node.prototype.getAncestorTransformsEnabled;
Kinetic.Factory.addGetterSetter(Kinetic.Node, 'transformsEnabled', true);
/**