From 09186c141b4f7ba9a73bac9c41a4204b62f44b37 Mon Sep 17 00:00:00 2001 From: Tom French Date: Fri, 4 Jul 2014 10:06:40 +0100 Subject: [PATCH] Fix group coordinates --- src/canvas.class.js | 3 --- src/mixins/canvas_grouping.mixin.js | 6 ++++-- src/static_canvas.class.js | 16 ++++++++-------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/canvas.class.js b/src/canvas.class.js index 84e48ec2..52326ba9 100644 --- a/src/canvas.class.js +++ b/src/canvas.class.js @@ -995,9 +995,6 @@ this._activeGroup = group; if (group) { group.canvas = this; - //group._calcBounds(); - //group._updateObjectsCoords(); - //group.setCoords(); group.set('active', true); } }, diff --git a/src/mixins/canvas_grouping.mixin.js b/src/mixins/canvas_grouping.mixin.js index b277ba94..f0323f0d 100644 --- a/src/mixins/canvas_grouping.mixin.js +++ b/src/mixins/canvas_grouping.mixin.js @@ -107,7 +107,8 @@ return new fabric.Group(groupObjects, { originX: 'center', - originY: 'center' + originY: 'center', + canvas: this }); }, @@ -126,7 +127,8 @@ else if (group.length > 1) { group = new fabric.Group(group.reverse(), { originX: 'center', - originY: 'center' + originY: 'center', + canvas: this }); this.setActiveGroup(group, e); group.saveCoords(); diff --git a/src/static_canvas.class.js b/src/static_canvas.class.js index 6567023a..c26134d1 100644 --- a/src/static_canvas.class.js +++ b/src/static_canvas.class.js @@ -670,14 +670,14 @@ _onObjectAdded: function(obj) { this.stateful && obj.setupState(); obj.canvas = this; - if (obj._objects) { - obj._calcBounds(); - for (var i = 0, len = obj._objects.length; i < len; i++) { - obj._objects[i].canvas = this; - this._onObjectAdded(obj._objects[i]); - } - obj._updateObjectsCoords(); - } + //if (obj._objects) { + // obj._calcBounds(); + // for (var i = 0, len = obj._objects.length; i < len; i++) { + // obj._objects[i].canvas = this; + // this._onObjectAdded(obj._objects[i]); + // } + // obj._updateObjectsCoords(); + //} obj.setCoords(); this.fire('object:added', { target: obj }); obj.fire('added');