From 0576c7c80c472beb67c855031975aa7708175370 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Tue, 31 May 2016 16:20:13 -0700 Subject: [PATCH] ImageLoader: Fixed data: links breakage. --- src/loaders/ImageLoader.js | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/loaders/ImageLoader.js b/src/loaders/ImageLoader.js index 0a5bad4a8d..7bab1421d4 100644 --- a/src/loaders/ImageLoader.js +++ b/src/loaders/ImageLoader.js @@ -13,22 +13,29 @@ Object.assign( THREE.ImageLoader.prototype, { load: function ( url, onLoad, onProgress, onError ) { var image = document.createElement( 'img' ); + image.onload = function () { - var loader = new THREE.XHRLoader( this.manager ); - loader.setPath( this.path ); - loader.setResponseType( 'blob' ); - loader.load( url, function ( blob ) { + URL.revokeObjectURL( image.src ); + if ( onLoad ) onLoad( image ); - image.onload = function () { + }; - URL.revokeObjectURL( image.src ); - if ( onLoad ) onLoad( image ); + if ( url.indexOf( 'data:' ) === 0 ) { - }; + image.src = url; - image.src = URL.createObjectURL( blob ); + } else { - }, onProgress, onError ); + var loader = new THREE.XHRLoader( this.manager ); + loader.setPath( this.path ); + loader.setResponseType( 'blob' ); + loader.load( url, function ( blob ) { + + image.src = URL.createObjectURL( blob ); + + }, onProgress, onError ); + + } return image; -- GitLab