Merge pull request #86 from VampireChicken12/dev

Dev
YouTube-Enhancer · Nov 14, 2023 · c7cbb96 · c7cbb96
2 parents 40193ce + d21d326
commit c7cbb96
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/src/@types/index.ts b/src/@types/index.ts
@@ -103,6 +103,7 @@ export type RequestDataMessage<Type extends string, D> = Prettify<
 >;
 export type ContentSendOnlyMessageMappings = {
 	setRememberedVolume: SendDataMessage<"send_data", "content", "setRememberedVolume", { shortsPageVolume?: number; watchPageVolume?: number }>;
+	pageLoaded: SendDataMessage<"send_data", "content", "pageLoaded", undefined>;
 };
 export type ExtensionSendOnlyMessageMappings = {
 	volumeBoostChange: DataResponseMessage<"volumeBoostChange", { volumeBoostEnabled: boolean; volumeBoostAmount?: number }>;

diff --git a/src/features/hideScrollBar/utils.ts b/src/features/hideScrollBar/utils.ts
@@ -5,6 +5,9 @@ export function hideScrollBar() {
 			width: 0px;
 			height: 0px;
 		}
+		html {
+			scrollbar-width: none;
+		}
 	`;
 	style.id = "yte-hide-scroll-bar";
 	document.head.appendChild(style);

diff --git a/src/manifest.ts b/src/manifest.ts
@@ -91,7 +91,13 @@ const manifestV2: Manifest.WebExtensionManifest = {
 		"src/pages/content/index.js",
 		"src/pages/inject/index.js",
 		...availableLocales.map((locale) => `/locales/${locale}.json`)
-	]
+	],
+	browser_specific_settings: {
+		gecko: {
+			id: "{c49b13b1-5dee-4345-925e-0c793377e3fa}",
+			strict_min_version: "48.0"
+		}
+	}
 };
 
 export { manifestV3, manifestV2 };
diff --git a/src/pages/content/index.tsx b/src/pages/content/index.tsx
@@ -11,7 +11,7 @@ import adjustVolumeOnScrollWheel from "@/src/features/scrollWheelVolumeControl";
 import { promptUserToResumeVideo, setupVideoHistory } from "@/src/features/videoHistory";
 import volumeBoost from "@/src/features/volumeBoost";
 import eventManager from "@/utils/EventManager";
-import { browserColorLog, formatError, waitForSpecificMessage } from "@/utils/utilities";
+import { browserColorLog, formatError, sendContentOnlyMessage, waitForSpecificMessage } from "@/utils/utilities";
 
 import type { ExtensionSendOnlyMessageMappings, Messages, YouTubePlayerDiv } from "@/src/@types";
 import { enableHideScrollBar } from "@/src/features/hideScrollBar";
@@ -275,6 +275,7 @@ window.onload = async function () {
 			}
 		}
 	});
+	sendContentOnlyMessage("pageLoaded", undefined);
 };
 window.onbeforeunload = function () {
 	eventManager.removeAllEventListeners();

diff --git a/src/pages/inject/index.tsx b/src/pages/inject/index.tsx
@@ -31,12 +31,6 @@ document.documentElement.appendChild(script);
 	});
 	sendExtensionMessage("options", "data_response", { options });
 })();
-window.onload = () => {
-	chrome.storage.onChanged.addListener(storageListeners);
-};
-window.onunload = () => {
-	chrome.storage.onChanged.removeListener(storageListeners);
-};
 
 /**
  * Listens for the "yte-message-from-youtube" event and handles incoming messages from the YouTube page.
@@ -126,6 +120,12 @@ document.addEventListener("yte-message-from-youtube", async () => {
 			});
 			break;
 		}
+		case "pageLoaded": {
+			chrome.storage.onChanged.addListener(storageListeners);
+			window.onunload = () => {
+				chrome.storage.onChanged.removeListener(storageListeners);
+			};
+		}
 	}
 });
 const storageListeners = async (changes: StorageChanges, areaName: string) => {