Merge pull request #107 from webdev-dev/master

kmiyauchi · web-flow · commit 19bfdeb582fe · 2017-11-30T12:36:42.000-05:00
CascadingPane: encodeURI
diff --git a/lib/CascadingPane/CascadingPaneMainView.js b/lib/CascadingPane/CascadingPaneMainView.js
@@ -168,9 +168,9 @@ var CascadingPaneMainView = function (_React$Component) {
 
             if (curSelect !== item[itemIdField]) {
                 if (curSelect) {
-                    window.location.href = window.location.href.replace('cascSelect=' + curSelect, 'cascSelect=' + item[itemIdField]);
+                    window.location.href = window.location.href.replace('cascSelect=' + encodeURI(curSelect), 'cascSelect=' + encodeURI(item[itemIdField]));
                 } else {
-                    window.location.href = window.location.href + '&cascSelect=' + item[itemIdField];
+                    window.location.href = window.location.href + '&cascSelect=' + encodeURI(item[itemIdField]);
                 }
             }
         }
diff --git a/lib/CascadingPane/CascadingPaneNav.js b/lib/CascadingPane/CascadingPaneNav.js
@@ -143,7 +143,7 @@ var CascadingPaneNav = function (_React$Component) {
 
 
             if (selected !== item[itemIdField]) {
-                window.location.href = window.location.href.split('?')[0] + '?cascNav=' + item[itemIdField];
+                window.location.href = window.location.href.split('?')[0] + '?cascNav=' + encodeURI(item[itemIdField]);
             }
         }
     }, {
diff --git a/src/CascadingPane/CascadingPaneMainView.jsx b/src/CascadingPane/CascadingPaneMainView.jsx
@@ -153,12 +153,12 @@ class CascadingPaneMainView extends React.Component {
         if (curSelect !== item[itemIdField]) {
             if (curSelect) {
                 window.location.href = window.location.href.replace(
-                    `cascSelect=${curSelect}`,
-                    `cascSelect=${item[itemIdField]}`,
+                    `cascSelect=${encodeURI(curSelect)}`,
+                    `cascSelect=${encodeURI(item[itemIdField])}`,
                 );
             } else {
                 window.location.href = `${window.location.href}&cascSelect=${
-                    item[itemIdField]
+                    encodeURI(item[itemIdField])
                 }`;
             }
         }
diff --git a/src/CascadingPane/CascadingPaneNav.jsx b/src/CascadingPane/CascadingPaneNav.jsx
@@ -136,7 +136,7 @@ class CascadingPaneNav extends React.Component {
         if (selected !== item[itemIdField]) {
             window.location.href = `${
                 window.location.href.split('?')[0]
-            }?cascNav=${item[itemIdField]}`;
+            }?cascNav=${encodeURI(item[itemIdField])}`;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -168,9 +168,9 @@ var CascadingPaneMainView = function (_React$Component) {`
`168`	`168`
`169`	`169`	`if (curSelect !== item[itemIdField]) {`
`170`	`170`	`if (curSelect) {`
`171`		`- window.location.href = window.location.href.replace('cascSelect=' + curSelect, 'cascSelect=' + item[itemIdField]);`
	`171`	`+ window.location.href = window.location.href.replace('cascSelect=' + encodeURI(curSelect), 'cascSelect=' + encodeURI(item[itemIdField]));`
`172`	`172`	`} else {`
`173`		`- window.location.href = window.location.href + '&cascSelect=' + item[itemIdField];`
	`173`	`+ window.location.href = window.location.href + '&cascSelect=' + encodeURI(item[itemIdField]);`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`	`}`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ var CascadingPaneNav = function (_React$Component) {`
`143`	`143`
`144`	`144`
`145`	`145`	`if (selected !== item[itemIdField]) {`
`146`		`- window.location.href = window.location.href.split('?')[0] + '?cascNav=' + item[itemIdField];`
	`146`	`+ window.location.href = window.location.href.split('?')[0] + '?cascNav=' + encodeURI(item[itemIdField]);`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`	`}, {`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ class CascadingPaneNav extends React.Component {`
`136`	`136`	`if (selected !== item[itemIdField]) {`
`137`	`137`	window.location.href = `${
`138`	`138`	`window.location.href.split('?')[0]`
`139`		- }?cascNav=${item[itemIdField]}`;
	`139`	+ }?cascNav=${encodeURI(item[itemIdField])}`;
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`