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

Merge pull request #569 from xxorax/master

Browse source 
Build canvas from json even if no object is sent
This commit is contained in:
Juriy Zaytsev 2013-04-18 15:13:55 -07:00
commit 359df373c0
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/canvas_serialization.mixin.js
View file

@ -20,7 +20,11 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, /** @scope fabric.Stati
? JSON.parse(json)
: json;
if (!serialized || (serialized && !serialized.objects)) return;
if (!serialized) return;
if (!serialized.objects) {
serialized.objects = [];
}
this.clear();
@ -175,6 +179,10 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, /** @scope fabric.Stati
backgroundPatternLoaded,
backgroundImageLoaded,
overlayImageLoaded;
var cbIfLoaded = function () {
callback && backgroundImageLoaded && overlayImageLoaded && backgroundPatternLoaded && callback();
};
if (serialized.backgroundImage) {
this.setBackgroundImage(serialized.backgroundImage, function() {
@ -186,7 +194,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, /** @scope fabric.Stati
backgroundImageLoaded = true;
callback && overlayImageLoaded && backgroundPatternLoaded && callback();
cbIfLoaded();
});
}
else {
@ -202,7 +210,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, /** @scope fabric.Stati
_this.renderAll();
overlayImageLoaded = true;
callback && backgroundImageLoaded && backgroundPatternLoaded && callback();
cbIfLoaded();
});
}
else {
@ -215,7 +223,7 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, /** @scope fabric.Stati
_this.renderAll();
backgroundPatternLoaded = true;
callback && overlayImageLoaded && backgroundImageLoaded && callback();
cbIfLoaded();
});
}
else {