提交 a955ad4d 编写于 作者: M Mr.doob

FileLoader clean up.

上级 09b634d5
...@@ -46,15 +46,13 @@ Object.assign( FileLoader.prototype, { ...@@ -46,15 +46,13 @@ Object.assign( FileLoader.prototype, {
// Safari can not handle Data URIs through XMLHttpRequest so process manually // Safari can not handle Data URIs through XMLHttpRequest so process manually
if ( dataUriRegexResult ) { if ( dataUriRegexResult ) {
var mimeType = dataUriRegexResult[1]; var mimeType = dataUriRegexResult[ 1 ];
var isBase64 = !!dataUriRegexResult[2]; var isBase64 = !! dataUriRegexResult[ 2 ];
var data = dataUriRegexResult[3]; var data = dataUriRegexResult[ 3 ];
data = window.decodeURIComponent(data); data = window.decodeURIComponent( data );
if( isBase64 ) { if ( isBase64 ) data = window.atob( data );
data = window.atob(data);
}
try { try {
...@@ -67,16 +65,18 @@ Object.assign( FileLoader.prototype, { ...@@ -67,16 +65,18 @@ Object.assign( FileLoader.prototype, {
case 'blob': case 'blob':
response = new ArrayBuffer( data.length ); response = new ArrayBuffer( data.length );
var view = new Uint8Array( response ); var view = new Uint8Array( response );
for ( var i = 0; i < data.length; i ++ ) { for ( var i = 0; i < data.length; i ++ ) {
view[ i ] = data.charCodeAt( i ); view[ i ] = data.charCodeAt( i );
} }
if ( responseType === 'blob' ) { if ( responseType === 'blob' ) {
response = new Blob( [ response ], { "type" : mimeType } ); response = new Blob( [ response ], { type: mimeType } );
} }
...@@ -104,24 +104,24 @@ Object.assign( FileLoader.prototype, { ...@@ -104,24 +104,24 @@ Object.assign( FileLoader.prototype, {
} }
// Wait for next browser tick // Wait for next browser tick
window.setTimeout( function() { window.setTimeout( function () {
if ( onLoad ) onLoad( response ); if ( onLoad ) onLoad( response );
scope.manager.itemEnd( url ); scope.manager.itemEnd( url );
}, 0); }, 0 );
} catch ( error ) { } catch ( error ) {
// Wait for next browser tick // Wait for next browser tick
window.setTimeout( function() { window.setTimeout( function () {
if ( onError ) onError( error ); if ( onError ) onError( error );
scope.manager.itemError( url ); scope.manager.itemError( url );
}, 0); }, 0 );
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册