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

Fix loadFromJSON for image objects without image filters

Browse source
This commit is contained in:
Stefan Kienzle 2013-08-21 10:08:35 +02:00
parent 2f4cc5ec25
commit 55d5d99fdc
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/node.js
View file

@ -106,7 +106,7 @@
fabric.loadSVGFromString = function(string, callback, reviver) {
var doc = new DOMParser().parseFromString(string);
fabric.parseSVGDocument(doc.documentElement, function(results, options) {
callback(results, options);
callback && callback(results, options);
}, reviver);
};
@ -122,8 +122,10 @@
var oImg = new fabric.Image(img);
oImg._initConfig(object);
oImg._initFilters(object);
callback(oImg);
oImg._initFilters(object, function(filters) {
oImg.filters = filters || [ ];
callback && callback(oImg);
});
});
};

7
src/shapes/image.class.js
View file

@ -364,9 +364,12 @@
_initFilters: function(object, callback) {
if (object.filters && object.filters.length) {
fabric.util.enlivenObjects(object.filters, function(enlivenedObjects) {
callback(enlivenedObjects);
callback && callback(enlivenedObjects);
}, 'fabric.Image.filters');
}
else {
callback && callback();
}
},
/**
@ -419,7 +422,7 @@
/** @ignore */
img.onload = function() {
fabric.Image.prototype._initFilters.call(object, object, function(filters) {
object.filters = filters;
object.filters = filters || [ ];
var instance = new fabric.Image(img, object);
callback && callback(instance);