Fix to not remove trailing slash on paths.

websanova · Apr 22, 2017 · 6d1209c · 6d1209c
1 parent daeed5e
commit 6d1209c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "js-url",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "description": "A simple, lightweight url parser for JavaScript (~1.7 Kb minified, ~0.7Kb gzipped).",
   "main": "url.js",
   "repository": {

diff --git a/tests.js b/tests.js
@@ -144,25 +144,25 @@ test('protocol', function() {
 test('path', function() {
   deepEqual( window.url( 'path', url ), '/path/index.html' );
   deepEqual( window.url( 'path', 'http://www.domain.com/first/second' ), '/first/second' );
-  deepEqual( window.url( 'path', 'http://www.domain.com/first/second/' ), '/first/second' );
+  deepEqual( window.url( 'path', 'http://www.domain.com/first/second/' ), '/first/second/' );
   deepEqual( window.url( 'path', 'http://www.domain.com:8080/first/second' ), '/first/second' );
-  deepEqual( window.url( 'path', 'http://www.domain.com:8080/first/second/' ), '/first/second' );
+  deepEqual( window.url( 'path', 'http://www.domain.com:8080/first/second/' ), '/first/second/' );
   deepEqual( window.url( 'path', 'http://www.domain.com/first/second?test=foo' ), '/first/second' );
-  deepEqual( window.url( 'path', 'http://www.domain.com/first/second/?test=foo' ), '/first/second' );
+  deepEqual( window.url( 'path', 'http://www.domain.com/first/second/?test=foo' ), '/first/second/' );
   deepEqual( window.url( 'path', 'http://www.domain.com/path#anchor' ), '/path' );
-  deepEqual( window.url( 'path', 'http://www.domain.com/path/#anchor' ), '/path' );
+  deepEqual( window.url( 'path', 'http://www.domain.com/path/#anchor' ), '/path/' );
   deepEqual( window.url( 'path', 'http://www.domain.com' ), '' );
-  deepEqual( window.url( 'path', 'http://www.domain.com/' ), '' );
+  deepEqual( window.url( 'path', 'http://www.domain.com/' ), '/' );
   deepEqual( window.url( 'path', 'http://www.domain.com#anchor' ), '' );
-  deepEqual( window.url( 'path', 'http://www.domain.com/#anchor' ), '' );
+  deepEqual( window.url( 'path', 'http://www.domain.com/#anchor' ), '/' );
   deepEqual( window.url( 'path', 'http://www.domain.com?test=foo' ), '' );
-  deepEqual( window.url( 'path', 'http://www.domain.com/?test=foo' ), '' );
+  deepEqual( window.url( 'path', 'http://www.domain.com/?test=foo' ), '/' );
   deepEqual( window.url( 'path', 'http://www.domain.com:80' ), '' );
-  deepEqual( window.url( 'path', 'http://www.domain.com:80/' ), '' );
+  deepEqual( window.url( 'path', 'http://www.domain.com:80/' ), '/' );
   deepEqual( window.url( 'path', 'http://www.domain.com:80#anchor' ), '' );
-  deepEqual( window.url( 'path', 'http://www.domain.com:80/#anchor' ), '' );
+  deepEqual( window.url( 'path', 'http://www.domain.com:80/#anchor' ), '/' );
   deepEqual( window.url( 'path', 'http://www.domain.com:80?test=foo' ), '' );
-  deepEqual( window.url( 'path', 'http://www.domain.com:80/?test=foo' ), '' );
+  deepEqual( window.url( 'path', 'http://www.domain.com:80/?test=foo' ), '/' );
 });
 
 test('file', function() {
@@ -186,7 +186,8 @@ test('url parts', function() {
   deepEqual( window.url( '1', 'http://www.domain.com/first/second' ), 'first' );
   deepEqual( window.url( '1', 'http://www.domain.com/first/second/' ), 'first' );
   deepEqual( window.url( '-1', 'http://www.domain.com/first/second?test=foo' ), 'second' );
-  deepEqual( window.url( '-1', 'http://www.domain.com/first/second/?test=foo' ), 'second' );
+  deepEqual( window.url( '-1', 'http://www.domain.com/first/second/?test=foo' ), '' );
+  deepEqual( window.url( '-2', 'http://www.domain.com/first/second/?test=foo' ), 'second' );
 });
 
 test('query string', function() {
@@ -238,7 +239,8 @@ test('hash string', function() {
 test('hash bangs', function() {
   deepEqual( window.url( '?poo', 'http://domain.com/#!?' ), undefined );
   deepEqual( window.url( '?poo', 'http://domain.com/#!/' ), undefined );
-  deepEqual( window.url( '-1', 'http://www.domain.com/#!/first/second/?test=foo' ), 'second' );
+  deepEqual( window.url( '-1', 'http://www.domain.com/#!/first/second/?test=foo' ), '' );
+  deepEqual( window.url( '-2', 'http://www.domain.com/#!/first/second/?test=foo' ), 'second' );
   deepEqual( window.url( '?', 'http://domain.com/#!/?field[0]=zero&field[1]=one&var=test' ), {'field': ['zero', 'one'], 'var': 'test'} );
   deepEqual( window.url( '?', 'http://domain.com/#!?field[0]=zero&field[1]=one&var=test' ), {'field': ['zero', 'one'], 'var': 'test'} );
   deepEqual( window.url( '#', 'http://domain.com/#!/#field[0]=zero&field[1]=one&var=test' ), {'field': ['zero', 'one'], 'var': 'test'} );

diff --git a/url-tld.min.js b/url-tld.min.js
diff --git a/url.jquery.json b/url.jquery.json
@@ -6,7 +6,7 @@
     "websanova",
     "url"
   ],
-  "version": "2.4.1",
+  "version": "2.5.0",
   "author": {
     "name": "Websanova",
     "email": "rob@websanova.com",

diff --git a/url.js b/url.js
@@ -114,7 +114,7 @@
                 }
 
                 // Clean up path.
-                _l.path = (_l.path || '').replace(/^([^\/])/, '/$1').replace(/\/$/, '');
+                _l.path = (_l.path || '').replace(/^([^\/])/, '/$1');
 
                 // Return path parts.
                 if (arg.match(/^[\-0-9]+$/)) { arg = arg.replace(/^([^\/])/, '/$1'); }

diff --git a/url.min.js b/url.min.js