lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-04-05 20:48:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1250 from HardenedHunter/master

Browse Source 
Added error handler for Image.fromURL
This commit is contained in:
Anton Lavrenov 2021-12-14 11:57:58 -05:00 committed by GitHub
commit 0eda0dc7e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shapes/Image.ts
View File

@ -122,6 +122,7 @@ export class Image extends Shape<ImageConfig> {
* @memberof Konva.Image
* @param {String} url image source
* @param {Function} callback with Konva.Image instance as first argument
* @param {Function} onError optional error handler
* @example
* Konva.Image.fromURL(imageURL, function(image){
* // image is Konva.Image instance
@ -129,7 +130,7 @@ export class Image extends Shape<ImageConfig> {
* layer.draw();
* });
*/
static fromURL(url, callback) {
static fromURL(url, callback, onError = null) {
var img = Util.createImageElement();
img.onload = function () {
var image = new Image({
@ -137,6 +138,7 @@ export class Image extends Shape<ImageConfig> {
});
callback(image);
};
img.onerror = onError;
img.crossOrigin = 'Anonymous';
img.src = url;
}

10
test/unit/Image-test.ts
View File

@ -356,6 +356,16 @@ describe('Image', function () {
});
});
it('check loading failure', function (done) {
var stage = addStage();
var layer = new Konva.Layer();
stage.add(layer);
var src = 'non-existent.jpg';
Konva.Image.fromURL(src, null, function (e) {
done();
});
});
it('check zero values', function (done) {
loadImage('darth-vader.jpg', (imageObj) => {
var stage = addStage();