Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-05-09 22:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

do not set background or overlay image if the load fails. (#3003)

Browse source
This commit is contained in:
Andrea Bogazzi 2016-05-23 14:53:09 +02:00
parent 1843581488
commit dd3e6a81e2
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/static_canvas.class.js
View file

@ -398,7 +398,7 @@
__setBgOverlayImage: function(property, image, callback, options) {
if (typeof image === 'string') {
fabric.util.loadImage(image, function(img) {
this[property] = new fabric.Image(img, options);
img && (this[property] = new fabric.Image(img, options));
callback && callback(img);
}, this, options && options.crossOrigin);
}

12
test/unit/canvas_static.js
View file

@ -1217,6 +1217,18 @@
});
});
//how to test with an exception?
/*asyncTest('options in setBackgroundImage from invalid URL', function() {
canvas.backgroundImage = null;
canvas.setBackgroundImage(IMG_SRC + '_not_exist', function() {
equal(canvas.backgroundImage, null);
start();
}, {
left: 50,
originX: 'right'
});
});*/
asyncTest('options in setBackgroundImage from image instance', function() {
createImageObject(function(imageInstance) {
canvas.setBackgroundImage(imageInstance, function() {