Use + instead of %20 for spaces in URLs

remix-run · Jun 27, 2015 · d955d7a · d955d7a
1 parent 0b78745
commit d955d7a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/modules/URLUtils.js b/modules/URLUtils.js
@@ -117,7 +117,7 @@ export function matchPattern(pattern, pathname) {
   var remainingPathname, paramValues;
   if (match != null) {
     paramValues = Array.prototype.slice.call(match, 1).map(function (v) {
-      return v != null ? decodeURIComponent(v) : v;
+      return v != null ? decodeURIComponent(v.replace(/\+/g, '%20')) : v;
     });
 
     if (captureRemaining) {
@@ -177,7 +177,7 @@ export function formatPattern(pattern, params) {
       );
 
       if (paramValue != null)
-        pathname += encodeURI(paramValue);
+        pathname += encodeURI(paramValue).replace(/%20/g, '+');
     } else if (token === '(') {
       parenCount += 1;
     } else if (token === ')') {
@@ -193,7 +193,7 @@ export function formatPattern(pattern, params) {
       );
 
       if (paramValue != null)
-        pathname += encodeURIComponent(paramValue);
+        pathname += encodeURIComponent(paramValue).replace(/%20/g, '+');
     } else {
       pathname += token;
     }

diff --git a/modules/__tests__/URLUtils-test.js b/modules/__tests__/URLUtils-test.js
@@ -245,7 +245,7 @@ describe('formatPattern', function () {
 
     describe('and some params have special URL encoding', function () {
       it('returns the correct path', function () {
-        expect(formatPattern(pattern, { id: 'one, two' })).toEqual('comments/one%2C%20two/edit');
+        expect(formatPattern(pattern, { id: 'one, two' })).toEqual('comments/one%2C+two/edit');
       });
     });