Run path components through encode/decodeURIComponent

jagare · Jun 19, 2015 · 6baaa6c · 6baaa6c
1 parent 4759961
commit 6baaa6c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/modules/DOMUtils.js b/modules/DOMUtils.js
@@ -18,9 +18,7 @@ export function replaceHashPath(path) {
 }
 
 export function getWindowPath() {
-  return decodeURI(
-    window.location.pathname + window.location.search
-  );
+  return window.location.pathname + window.location.search;
 }
 
 export function getWindowScrollPosition() {

diff --git a/modules/URLUtils.js b/modules/URLUtils.js
@@ -116,7 +116,9 @@ export function matchPattern(pattern, pathname) {
 
   var remainingPathname, paramValues;
   if (match != null) {
-    paramValues = Array.prototype.slice.call(match, 1);
+    paramValues = Array.prototype.slice.call(match, 1).map(
+      (v) => v != null ? decodeURIComponent(v) : v
+    );
 
     if (captureRemaining) {
       remainingPathname = paramValues.pop();
@@ -191,7 +193,7 @@ export function formatPattern(pattern, params) {
       );
 
       if (paramValue != null)
-        pathname += paramValue;
+        pathname += encodeURIComponent(paramValue);
     } else {
       pathname += token;
     }

diff --git a/modules/__tests__/URLUtils-test.js b/modules/__tests__/URLUtils-test.js
@@ -245,13 +245,13 @@ 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, two/edit');
+        expect(formatPattern(pattern, { id: 'one, two' })).toEqual('comments/one%2C%20two/edit');
       });
     });
 
     describe('and a param has a forward slash', function () {
       it('preserves the forward slash', function () {
-        expect(formatPattern(pattern, { id: 'the/id' })).toEqual('comments/the/id/edit');
+        expect(formatPattern(pattern, { id: 'the/id' })).toEqual('comments/the%2Fid/edit');
       });
     });