Browse Source

Merge pull request #13673 from Mugen87/dev1

LoaderUtils: Simplify .extractUrlBase()
Mr.doob 7 years ago
parent
commit
e29f115e2f
2 changed files with 5 additions and 5 deletions
  1. 3 5
      src/loaders/LoaderUtils.js
  2. 2 0
      test/unit/src/loaders/LoaderUtils.tests.js

+ 3 - 5
src/loaders/LoaderUtils.js

@@ -31,13 +31,11 @@ var LoaderUtils = {
 
 
 	extractUrlBase: function ( url ) {
 	extractUrlBase: function ( url ) {
 
 
-		var parts = url.split( '/' );
+		var index = url.lastIndexOf( '/' );
 
 
-		if ( parts.length === 1 ) return './';
+		if ( index === - 1 ) return './';
 
 
-		parts.pop();
-
-		return parts.join( '/' ) + '/';
+		return url.substr( 0, index + 1 );
 
 
 	}
 	}
 
 

+ 2 - 0
test/unit/src/loaders/LoaderUtils.tests.js

@@ -23,6 +23,8 @@ export default QUnit.module( 'Loaders', () => {
 		QUnit.test( 'extractUrlBase', ( assert ) => {
 		QUnit.test( 'extractUrlBase', ( assert ) => {
 
 
 			assert.equal( '/path/to/', LoaderUtils.extractUrlBase( '/path/to/model.glb' ) );
 			assert.equal( '/path/to/', LoaderUtils.extractUrlBase( '/path/to/model.glb' ) );
+			assert.equal( './', LoaderUtils.extractUrlBase( 'model.glb' ) );
+			assert.equal( '/', LoaderUtils.extractUrlBase( '/model.glb' ) );
 
 
 		} );
 		} );