Browse Source

Update to FileLoader.js as per Richtr

As per @richtr simplified code in switch-case for ArrayBuffer and added comments you requested.
kkruups 8 years ago
parent
commit
22b9214e95
1 changed files with 9 additions and 7 deletions
  1. 9 7
      src/loaders/FileLoader.js

+ 9 - 7
src/loaders/FileLoader.js

@@ -64,9 +64,8 @@ Object.assign( FileLoader.prototype, {
 					case 'arraybuffer':
 					case 'blob':
 
-					 	response = new ArrayBuffer( data.length );
-
-						var view = new Uint8Array( response );
+					 
+						var view = new Uint8Array( data.length );
 
 						for ( var i = 0; i < data.length; i ++ ) {
 
@@ -76,9 +75,12 @@ Object.assign( FileLoader.prototype, {
 
 						if ( responseType === 'blob' ) {
 
-							response = new Blob( [ response ], { type: mimeType } );
+							response = new Blob( [ view.buffer ], { type: mimeType } );
 
-						}
+						} else {
+						   
+							response = view.buffer;	
+						}	
 
 						break;
 
@@ -103,7 +105,7 @@ Object.assign( FileLoader.prototype, {
 
 				}
 
-				// Wait for next browser tick
+				// Wait for next browser tick like standard XMLHttpRequest event dispatching does
 				window.setTimeout( function () {
 
 					if ( onLoad ) onLoad( response );
@@ -114,7 +116,7 @@ Object.assign( FileLoader.prototype, {
 
 			} catch ( error ) {
 
-				// Wait for next browser tick
+				// Wait for next browser tick like standard XMLHttpRequest event dispatching does
 				window.setTimeout( function () {
 
 					if ( onError ) onError( error );