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 for when toObjects is called on a canvas with a clipPath #5556

Merged
merged 6 commits into from
Mar 15, 2019
Merged

Fix for when toObjects is called on a canvas with a clipPath #5556

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af8ed77
refactor _toObjectMethod to add clipPath to return canvas object if i…
anthify Mar 5, 2019
4cc4cf7
add JSON.stringify to object comparison to pass deepEquals
anthify Mar 5, 2019
8d3abdb
remove trailing space
anthify Mar 5, 2019
72ed42a
call _toObjects with clipPath and methodName to retrieve object repre…
anthify Mar 10, 2019
d43b31b
remove redundant JSON.stringify on clipPath object. This was added to…
anthify Mar 10, 2019
8fe1c55
add full object for what clipPath should be in order to test against …
anthify Mar 13, 2019
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
2 changes: 1 addition & 1 deletion src/static_canvas.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,7 +1177,7 @@
objects: this._toObjects(methodName, propertiesToInclude),
};
if (clipPath) {
data.clipPath = this._toObjectMethod(clipPath, methodName, propertiesToInclude);
data.clipPath = this.clipPath;
Copy link
Member

Choose a reason for hiding this comment

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

wait, this should call _toOject anyway no?
In this way we are exporting the instance itself.
We want it's object representation.

}
extend(data, this.__serializeBgOverlay(methodName, propertiesToInclude));

Expand Down
19 changes: 19 additions & 0 deletions test/unit/canvas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,6 +1290,25 @@
assert.equal(canvas.toObject().objects[0].type, rect.type);
});


QUnit.test('toObject with clipPath', function(assert) {
var clipPath = makeRect();
var canvasWithClipPath = new fabric.Canvas(null, { clipPath: clipPath });
var expectedObject = {
'version': fabric.version,
objects: canvasWithClipPath.getObjects(),
'clipPath': clipPath.toObject()
};

assert.ok(typeof canvasWithClipPath.toObject === 'function');
assert.deepEqual(JSON.stringify(expectedObject), JSON.stringify(canvasWithClipPath.toObject()));

var rect = makeRect();
canvasWithClipPath.add(rect);

assert.equal(canvasWithClipPath.toObject().objects[0].type, rect.type);
anthify marked this conversation as resolved.
Show resolved Hide resolved
});

QUnit.test('toDatalessObject', function(assert) {
assert.ok(typeof canvas.toDatalessObject === 'function');
var expectedObject = {
Expand Down