Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-05-25 21:53:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix group loading in dateless json. Closes #322

Browse source
This commit is contained in:
kangax 2012-12-20 16:23:12 +01:00
parent 0326af39ca
commit f0d2235053
5 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dist/all.js vendored
View file

@ -8219,7 +8219,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
delete obj[pathProp];
if (typeof path !== 'string') {
if (obj.type === 'image') {
if (obj.type === 'image' || obj.type === 'group') {
fabric[fabric.util.string.capitalize(obj.type)].fromObject(obj, function (o) {
onObjectLoaded(o, index);
});

12
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.

2
src/canvas.serialization.js
View file

@ -56,7 +56,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, {
delete obj[pathProp];
if (typeof path !== 'string') {
if (obj.type === 'image') {
if (obj.type === 'image' || obj.type === 'group') {
fabric[fabric.util.string.capitalize(obj.type)].fromObject(obj, function (o) {
onObjectLoaded(o, index);
});

25
test/unit/canvas.js
View file

@ -878,4 +878,29 @@
});
});
asyncTest('loadFromDatalessJSON with async content', function() {
var circ1 = new fabric.Circle({ radius: 30, fill: '#55f', top: 0, left: 0 });
var circ2 = new fabric.Circle({ radius: 30, fill: '#f55', top: 50, left: 50 });
var circ3 = new fabric.Circle({ radius: 30, fill: '#5f5', top: 50, left: 50 });
var arr = [circ1, circ2];
var group = new fabric.Group(arr, { top: 150, left: 150 });
canvas.add(circ3);
canvas.add(group);
canvas.renderAll();
canvas.deactivateAll();
var json = JSON.stringify( canvas.toDatalessJSON() );
canvas.clear();
canvas.loadFromDatalessJSON(json, function() {
equal(2, canvas.getObjects().length);
equal('group', canvas.getObjects()[1].type);
start();
});
});
})();