Merge commit '4f142aa1058f14f153f8bfd2d82f04ddb9982388' into clippyup

[rust.git] / src / tools / error_index_generator / redirect.js

diff --git a/src/tools/error_index_generator/redirect.js b/src/tools/error_index_generator/redirect.js
index e6e910658e483baaf879b3f06a6d7d6393e78b6b..8c907f5795d324be867a792e25aeac775ebd3b88 100644 (file)
--- a/src/tools/error_index_generator/redirect.js
+++ b/src/tools/error_index_generator/redirect.js
@@ -1,10 +1,16 @@
-(function() {{
-    if (window.location.hash) {{
+(function() {
+    if (window.location.hash) {
         let code = window.location.hash.replace(/^#/, '');
         // We have to make sure this pattern matches to avoid inadvertently creating an
         // open redirect.
-        if (/^E[0-9]+$/.test(code)) {{
+        if (!/^E[0-9]+$/.test(code)) {
+            return;
+        }
+        if (window.location.pathname.indexOf("/error_codes/") !== -1) {
+            // We're not at the top level, so we don't prepend with "./error_codes/".
+            window.location = './' + code + '.html';
+        } else {
             window.location = './error_codes/' + code + '.html';
-        }}
-    }}
-}})()
+        }
+    }
+})()