Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-04-26 16:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More group refactoring

Browse source
This commit is contained in:
kangax 2013-11-10 17:31:59 +01:00
parent ffa794ed54
commit 1ecbf379ff
5 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dist/all.js vendored
View file

@ -16719,12 +16719,13 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
groupTop = this.getTop(),
rotated = this._getRotatedLeftTop(object);
object.setAngle(object.getAngle() + this.getAngle());
object.set('left', groupLeft + rotated.left);
object.set('top', groupTop + rotated.top);
object.set('scaleX', object.get('scaleX') * this.get('scaleX'));
object.set('scaleY', object.get('scaleY') * this.get('scaleY'));
object.set({
angle: object.getAngle() + this.getAngle(),
left: groupLeft + rotated.left,
top: groupTop + rotated.top,
scaleX: object.get('scaleX') * this.get('scaleX'),
scaleY: object.get('scaleY') * this.get('scaleY')
});
},
/**

6
dist/all.min.js vendored
View file

File diff suppressed because one or more lines are too long

BIN
dist/all.min.js.gz vendored
View file

Binary file not shown.

13
dist/all.require.js vendored
View file

@ -16719,12 +16719,13 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
groupTop = this.getTop(),
rotated = this._getRotatedLeftTop(object);
object.setAngle(object.getAngle() + this.getAngle());
object.set('left', groupLeft + rotated.left);
object.set('top', groupTop + rotated.top);
object.set('scaleX', object.get('scaleX') * this.get('scaleX'));
object.set('scaleY', object.get('scaleY') * this.get('scaleY'));
object.set({
angle: object.getAngle() + this.getAngle(),
left: groupLeft + rotated.left,
top: groupTop + rotated.top,
scaleX: object.get('scaleX') * this.get('scaleX'),
scaleY: object.get('scaleY') * this.get('scaleY')
});
},
/**

13
src/shapes/group.class.js
View file

@ -346,12 +346,13 @@
groupTop = this.getTop(),
rotated = this._getRotatedLeftTop(object);
object.setAngle(object.getAngle() + this.getAngle());
object.set('left', groupLeft + rotated.left);
object.set('top', groupTop + rotated.top);
object.set('scaleX', object.get('scaleX') * this.get('scaleX'));
object.set('scaleY', object.get('scaleY') * this.get('scaleY'));
object.set({
angle: object.getAngle() + this.getAngle(),
left: groupLeft + rotated.left,
top: groupTop + rotated.top,
scaleX: object.get('scaleX') * this.get('scaleX'),
scaleY: object.get('scaleY') * this.get('scaleY')
});
},
/**