Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix group initialization #2101

Merged
merged 1 commit into from
Jun 3, 2015
Merged

Fix group initialization #2101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 36 additions & 15 deletions src/shapes/group.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,19 @@
* Constructor
* @param {Object} objects Group objects
* @param {Object} [options] Options object
* @param {Boolean} [isAlreadyGrouped] if true, objects have been grouped already.
* @return {Object} thisArg
*/
initialize: function(objects, options) {
initialize: function(objects, options, isAlreadyGrouped) {
options = options || { };

this._objects = [];
// if objects enclosed in a group have been grouped already,
// we cannot change properties of objects.
// Thus we need to set options to group without objects,
// because delegatedProperties propagate to objects.
isAlreadyGrouped && this.callSuper('initialize', options);

this._objects = objects || [];
for (var i = this._objects.length; i--; ) {
this._objects[i].group = this;
Expand All @@ -67,31 +75,49 @@
if (options.originX) {
this.originX = options.originX;
}

if (options.originY) {
this.originY = options.originY;
}

this._calcBounds();
this._updateObjectsCoords();

this.callSuper('initialize', options);
if (isAlreadyGrouped) {
// do not change coordinate of objects enclosed in a group,
// because objects coordinate system have been group coodinate system already.
this._updateObjectsCoords(true);
}
else {
this._calcBounds();
this._updateObjectsCoords();
this.callSuper('initialize', options);
}

this.setCoords();
this.saveCoords();
},

/**
* @private
* @param {Boolean} [skipCoordsChange] if true, coordinates of objects enclosed in a group do not change
*/
_updateObjectsCoords: function() {
this.forEachObject(this._updateObjectCoords, this);
_updateObjectsCoords: function(skipCoordsChange) {
for (var i = this._objects.length; i--; ){
this._updateObjectCoords(this._objects[i], skipCoordsChange);
}
},

/**
* @private
* @param {Object} object
* @param {Boolean} [skipCoordsChange] if true, coordinates of object dose not change
*/
_updateObjectCoords: function(object) {
_updateObjectCoords: function(object, skipCoordsChange) {
// do not display corners of objects enclosed in a group
object.__origHasControls = object.hasControls;
object.hasControls = false;

if (skipCoordsChange) {
return;
}

var objectLeft = object.getLeft(),
objectTop = object.getTop(),
center = this.getCenterPoint();
Expand All @@ -102,12 +128,7 @@
left: objectLeft - center.x,
top: objectTop - center.y
});

object.setCoords();

// do not display corners of objects enclosed in a group
object.__origHasControls = object.hasControls;
object.hasControls = false;
},

/**
Expand Down Expand Up @@ -558,7 +579,7 @@
fabric.Group.fromObject = function(object, callback) {
fabric.util.enlivenObjects(object.objects, function(enlivenedObjects) {
delete object.objects;
callback && callback(new fabric.Group(enlivenedObjects, object));
callback && callback(new fabric.Group(enlivenedObjects, object, true));
});
};

Expand Down
12 changes: 11 additions & 1 deletion test/unit/group.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@
return new fabric.Group([ rect1, rect2 ], {strokeWidth: 0});
}

function makeGroupWith2ObjectsWithOpacity() {
var rect1 = new fabric.Rect({ top: 100, left: 100, width: 30, height: 10, strokeWidth: 0, opacity: 0.5 }),
rect2 = new fabric.Rect({ top: 120, left: 50, width: 10, height: 40, strokeWidth: 0, opacity: 0.8 });

return new fabric.Group([ rect1, rect2 ], {strokeWidth: 0});
}

function makeGroupWith4Objects() {
var rect1 = new fabric.Rect({ top: 100, left: 100, width: 30, height: 10 }),
rect2 = new fabric.Rect({ top: 120, left: 50, width: 10, height: 40 }),
Expand Down Expand Up @@ -363,7 +370,7 @@ test('toObject without default values', function() {
});

asyncTest('fromObject', function() {
var group = makeGroupWith2Objects();
var group = makeGroupWith2ObjectsWithOpacity();

ok(typeof fabric.Group.fromObject == 'function');
var groupObject = group.toObject();
Expand All @@ -375,6 +382,9 @@ test('toObject without default values', function() {

ok(newGroupFromObject instanceof fabric.Group);

deepEqual(objectFromOldGroup.objects[0], objectFromNewGroup.objects[0]);
deepEqual(objectFromOldGroup.objects[1], objectFromNewGroup.objects[1]);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!


// delete `objects` arrays, since `assertHashEqual` fails to compare them for equality
delete objectFromOldGroup.objects;
delete objectFromNewGroup.objects;
Expand Down