merge jekyll#229 and jekyll#233

prod · Stuart · cmbuckley · prod · commit 66e12c5acc9b · 2023-11-01T13:36:27.000+08:00
Co-authored-by: Stuart &lt;stuart.wheaton@jhuapl.edu&gt;
Co-authored-by: Chris Buckley &lt;chris@cmbuckley.co.uk&gt;
diff --git a/lib/jekyll-redirect-from/redirect.html b/lib/jekyll-redirect-from/redirect.html
@@ -1,11 +1,40 @@
 <!DOCTYPE html>
 <html lang="en-US">
-  <meta charset="utf-8">
-  <title>Redirecting&hellip;</title>
-  <link rel="canonical" href="{{ page.redirect.to }}">
-  <script>location="{{ page.redirect.to }}"</script>
-  <meta http-equiv="refresh" content="0; url={{ page.redirect.to }}">
-  <meta name="robots" content="noindex">
-  <h1>Redirecting&hellip;</h1>
-  <a href="{{ page.redirect.to }}">Click here if you are not redirected.</a>
+  <head>
+    <meta charset="utf-8" />
+    <title>Redirecting&hellip;</title>
+    <link rel="canonical" href="{{ page.redirect.to }}" />
+    <script>
+      const urlSuffix =
+        "" +
+        (location.hash ? location.hash : "") +
+        (location.search ? location.search : "");
+      location = "{{ page.redirect.to }}" + urlSuffix;
+    </script>
+    <meta
+      id="refresh-meta"
+      http-equiv="refresh"
+      content="0; url={{ page.redirect.to }}"
+    />
+    <meta name="robots" content="noindex" />
+  </head>
+  <body>
+    <h1>Redirecting&hellip;</h1>
+    <a id="redirect-link" href="{{ page.redirect.to }}"
+      >Click here if you are not redirected.</a
+    >
+    <script>
+      // Add hash and search to meta redirect and manual link, in case script above did not work
+      const urlSuffix2 =
+        "" +
+        (location.hash ? location.hash : "") +
+        (location.search ? location.search : "");
+      let refreshMeta = document.getElementById("refresh-meta");
+      const newContentStr = refreshMeta.getAttribute("content") + urlSuffix2;
+      refreshMeta.setAttribute("content", newContentStr);
+      let redirectLink = document.getElementById("redirect-link");
+      const newHrefUrl = redirectLink.getAttribute("href") + urlSuffix2;
+      redirectLink.setAttribute("href", newHrefUrl);
+    </script>
+  </body>
 </html>
diff --git a/spec/jekyll_redirect_from/redirect_page_spec.rb b/spec/jekyll_redirect_from/redirect_page_spec.rb
@@ -49,19 +49,15 @@
       end
 
       it "contains the meta refresh tag" do
-        expect(output).to match("<meta http-equiv=\"refresh\" content=\"0; url=#{site_url}#{to}\">")
-      end
-
-      it "contains the javascript redirect" do
-        expect(output).to match("<script>location=\"#{site_url}#{to}\"</script>")
+        expect(output).to match("<meta id=\"refresh-meta\" http-equiv=\"refresh\" content=\"0; url=#{site_url}#{to}\">")
       end
 
       it "contains canonical link in header" do
         expect(output).to match("<link rel=\"canonical\" href=\"#{site_url}#{to}\">")
       end
 
       it "contains the clickable link" do
-        expect(output).to match("<a href=\"#{site_url}#{to}\">Click here if you are not redirected.</a>")
+        expect(output).to match("<a id=\"redirect-link\" href=\"#{site_url}#{to}\">Click here if you are not redirected.</a>")
       end
     end
   end
