Browse Source

Merge pull request #11015 from alemures/dev

utils: Fixed regression in IE/Edge with PR #11002
Mr.doob 8 years ago
parent
commit
499455ef5b
2 changed files with 5 additions and 13 deletions
  1. 4 12
      src/utils.js
  2. 1 1
      test/unit/src/utils.js

+ 4 - 12
src/utils.js

@@ -1,14 +1,10 @@
 function arrayMin( array ) {
 
-	if ( array.length === 0 ) {
-
-		return Infinity;
-
-	}
+	if ( array.length === 0 ) return Infinity;
 
 	var min = array[ 0 ];
 
-	for ( var i = 1; i < array.length; ++ i ) {
+	for ( var i = 1, length = array.length; i < length; ++ i ) {
 
 		if ( array[ i ] < min ) {
 
@@ -24,15 +20,11 @@ function arrayMin( array ) {
 
 function arrayMax( array ) {
 
-	if ( array.length === 0 ) {
-
-		return - Infinity;
-
-	}
+	if ( array.length === 0 ) return - Infinity;
 
 	var max = array[ 0 ];
 
-	for ( var i = 1; i < array.length; ++ i ) {
+	for ( var i = 1, length = array.length; i < length; ++ i ) {
 
 		if ( array[ i ] > max ) {
 

+ 1 - 1
test/unit/src/utils.js

@@ -9,7 +9,7 @@ QUnit.test( 'arrayMax' , function( assert ) {
 	assert.equal( THREE.arrayMax( [] ), - Infinity );
 	assert.equal( THREE.arrayMax( [ 5 ] ), 5 );
 	assert.equal( THREE.arrayMax( [ 1, 5, 10 ] ), 10 );
-	assert.equal( THREE.arrayMax( [ 5, 1, 10 ] ), 10 );
+	assert.equal( THREE.arrayMax( [ 1, 10, 5 ] ), 10 );
 	assert.equal( THREE.arrayMax( [ 10, 5, 1 ] ), 10 );
 
 });