Bladeren bron

Checking whether .overrideMimeType is available before calling it (and hopefully make IE9 happy)

Mr.doob 13 jaren geleden
bovenliggende
commit
609590839d
3 gewijzigde bestanden met toevoegingen van 3 en 9 verwijderingen
  1. 1 7
      src/extras/loaders/ColladaLoader.js
  2. 1 1
      src/extras/loaders/JSONLoader.js
  3. 1 1
      src/extras/loaders/SceneLoader.js

+ 1 - 7
src/extras/loaders/ColladaLoader.js

@@ -57,13 +57,7 @@ THREE.ColladaLoader = function () {
 
 			var req = new XMLHttpRequest();
 
-			if( req.overrideMimeType ) {
-
-				// need this? yes... if extension is other then *.xml :-S
-
-				req.overrideMimeType( "text/xml" );
-
-			}
+			if ( req.overrideMimeType ) req.overrideMimeType( "text/xml" );
 
 			req.onreadystatechange = function() {
 

+ 1 - 1
src/extras/loaders/JSONLoader.js

@@ -90,7 +90,7 @@ THREE.JSONLoader.prototype.loadAjaxJSON = function( context, url, callback, text
 	};
 
 	xhr.open( "GET", url, true );
-	xhr.overrideMimeType( "text/plain; charset=x-user-defined" );
+	if ( xhr.overrideMimeType ) xhr.overrideMimeType( "text/plain; charset=x-user-defined" );
 	xhr.setRequestHeader( "Content-Type", "text/plain" );
 	xhr.send( null );
 

+ 1 - 1
src/extras/loaders/SceneLoader.js

@@ -58,7 +58,7 @@ THREE.SceneLoader.prototype.load = function( url, callbackFinished ) {
 	};
 
 	xhr.open( "GET", url, true );
-	xhr.overrideMimeType( "text/plain; charset=x-user-defined" );
+	if ( xhr.overrideMimeType ) xhr.overrideMimeType( "text/plain; charset=x-user-defined" );
 	xhr.setRequestHeader( "Content-Type", "text/plain" );
 	xhr.send( null );