Fix bug that URL won't be shortend in some pages (window.onload is …

…untrustworthy)
r7kamura · May 16, 2022 · ccb9ff0 · ccb9ff0
1 parent 012f83b
commit ccb9ff0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixed
+
+- Fix bug that URL won't be shortend in some pages (`window.onload` is untrustworthy).
+
 ## 1.2.0 - 2022-05-17
 
 ### Added

diff --git a/manifest.json b/manifest.json
@@ -31,6 +31,7 @@
         "https://www.amazon.se/*",
         "https://www.amazon.sg/*"
       ],
+      "run_at": "document_end",
       "js": ["src/main.ts"]
     }
   ]

diff --git a/src/main.ts b/src/main.ts
@@ -2,17 +2,16 @@ function replaceState(path: string) {
   window.history.replaceState({}, "", path);
 }
 
-window.onload = () => {
-  const asinElement = document.querySelector(
-    '#ASIN, input[name="idx.asin"], input[name="ASIN.0"], input[name="titleID"]'
-  ) as HTMLInputElement;
-  if (asinElement) {
-    replaceState(`/dp/${asinElement.value}`);
-  } else {
-    const href = window.location.href;
-    const match = href.match(/\/(?:dp|gp\/product)\/([A-Z0-9]{10})[/?]?/);
-    if (match) {
-      replaceState(`/dp/${match[1]}`);
-    }
+const asinElement = document.querySelector(
+  '#ASIN, input[name="idx.asin"], input[name="ASIN.0"], input[name="titleID"]'
+) as HTMLInputElement;
+
+if (asinElement) {
+  replaceState(`/dp/${asinElement.value}`);
+} else {
+  const href = window.location.href;
+  const match = href.match(/\/(?:dp|gp\/product)\/([A-Z0-9]{10})[/?]?/);
+  if (match) {
+    replaceState(`/dp/${match[1]}`);
   }
-};
+}