Merge pull request #2600 from daiyam/fix-taglist

Rokt33r · web-flow · commit 30e6fc516b1d · 2018-11-13T00:26:10.000+09:00
fix route when selecting multiple tags
diff --git a/browser/main/SideNav/index.js b/browser/main/SideNav/index.js
@@ -269,7 +269,7 @@ class SideNav extends React.Component {
     const tags = pathSegments[pathSegments.length - 1]
     return (tags === 'alltags')
       ? []
-      : tags.split(' ').map(tag => decodeURIComponent(tag))
+      : decodeURIComponent(tags).split(' ')
   }
 
   handleClickTagListItem (name) {
@@ -301,7 +301,7 @@ class SideNav extends React.Component {
     } else {
       listOfTags.push(tag)
     }
-    router.push(`/tags/${listOfTags.map(tag => encodeURIComponent(tag)).join(' ')}`)
+    router.push(`/tags/${encodeURIComponent(listOfTags.join(' '))}`)
   }
 
   emptyTrash (entries) {

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ class SideNav extends React.Component {`
`269`	`269`	`const tags = pathSegments[pathSegments.length - 1]`
`270`	`270`	`return (tags === 'alltags')`
`271`	`271`	`? []`
`272`		`- : tags.split(' ').map(tag => decodeURIComponent(tag))`
	`272`	`+ : decodeURIComponent(tags).split(' ')`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`handleClickTagListItem (name) {`
`@@ -301,7 +301,7 @@ class SideNav extends React.Component {`
`301`	`301`	`} else {`
`302`	`302`	`listOfTags.push(tag)`
`303`	`303`	`}`
`304`		- router.push(`/tags/${listOfTags.map(tag => encodeURIComponent(tag)).join(' ')}`)
	`304`	+ router.push(`/tags/${encodeURIComponent(listOfTags.join(' '))}`)
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`emptyTrash (entries) {`