Browse Source

Merge pull request #3452 from weseek/fix/not-show-comparison-link-at-top

delete slash
Yuki Takei 5 years ago
parent
commit
ca739a8b10
1 changed files with 8 additions and 2 deletions
  1. 8 2
      src/client/js/components/RevisionComparer/RevisionComparer.jsx

+ 8 - 2
src/client/js/components/RevisionComparer/RevisionComparer.jsx

@@ -45,8 +45,14 @@ const RevisionComparer = (props) => {
     const { path } = revisionComparerContainer.pageContainer.state;
     const { path } = revisionComparerContainer.pageContainer.state;
     const { sourceRevision, targetRevision } = revisionComparerContainer.state;
     const { sourceRevision, targetRevision } = revisionComparerContainer.state;
 
 
-    const urlParams = (sourceRevision && targetRevision ? `?compare=${sourceRevision._id}...${targetRevision._id}` : '');
-    return encodeSpaces(decodeURI(`${origin}/${path}${urlParams}`));
+    const url = new URL(path, origin);
+
+    if (sourceRevision != null && targetRevision != null) {
+      const urlParams = `${sourceRevision._id}...${targetRevision._id}`;
+      url.searchParams.set('compare', urlParams);
+    }
+
+    return encodeSpaces(decodeURI(url));
   };
   };
 
 
   const { sourceRevision, targetRevision } = revisionComparerContainer.state;
   const { sourceRevision, targetRevision } = revisionComparerContainer.state;