Jelajahi Sumber

LoadingManager: Make resourceTransform private; fix whitespace.

Don McCurdy 7 tahun lalu
induk
melakukan
65f7fce985
2 mengubah file dengan 15 tambahan dan 14 penghapusan
  1. 7 6
      src/loaders/LoadingManager.js
  2. 8 8
      test/unit/src/loaders/LoadingManager.js

+ 7 - 6
src/loaders/LoadingManager.js

@@ -6,15 +6,16 @@ function LoadingManager( onLoad, onProgress, onError ) {
 
 	var scope = this;
 
-	var isLoading = false, itemsLoaded = 0, itemsTotal = 0;
+	var isLoading = false;
+	var itemsLoaded = 0;
+	var itemsTotal = 0;
+	var resourceTransform = undefined;
 
 	this.onStart = undefined;
 	this.onLoad = onLoad;
 	this.onProgress = onProgress;
 	this.onError = onError;
 
-	this.resourceTransform = undefined;
-
 	this.itemStart = function ( url ) {
 
 		itemsTotal ++;
@@ -69,9 +70,9 @@ function LoadingManager( onLoad, onProgress, onError ) {
 
 	this.resolveResourceURL = function ( url ) {
 
-		if ( this.resourceTransform ) {
+		if ( resourceTransform ) {
 
-			return this.resourceTransform( url );
+			return resourceTransform( url );
 
 		}
 
@@ -81,7 +82,7 @@ function LoadingManager( onLoad, onProgress, onError ) {
 
 	this.setResourceTransform = function ( transform ) {
 
-		this.resourceTransform = transform;
+		resourceTransform = transform;
 
 	};
 

+ 8 - 8
test/unit/src/loaders/LoadingManager.js

@@ -6,17 +6,17 @@ QUnit.module( "LoadingManager" );
 
 QUnit.test( "setResourceTransform", function( assert ) {
 
-  var manager = new THREE.LoadingManager();
-  var suffix = '?transformed=true';
+	var manager = new THREE.LoadingManager();
+	var suffix = '?transformed=true';
 
-  manager.setResourceTransform( function ( url ) {
+	manager.setResourceTransform( function ( url ) {
 
-    return url + suffix;
+		return url + suffix;
 
-  } );
+	} );
 
-  var url = 'https://foo.bar/baz';
-  var resolvedURL = manager.resolveResourceURL( url );
-  assert.equal( resolvedURL, url + suffix, 'URL transform is applied' );
+	var url = 'https://foo.bar/baz';
+	var resolvedURL = manager.resolveResourceURL( url );
+	assert.equal( resolvedURL, url + suffix, 'URL transform is applied' );
 
 });