move menu creation out of onPageChange

GooseOb · Dec 1, 2024 · c92aab5 · c92aab5
1 parent 48f02f5
commit c92aab5
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 28 deletions.
diff --git a/index.ts b/index.ts
@@ -537,32 +537,7 @@ const applySettings = (settings: Cfg) => {
 	});
 };
 
-const delay = (ms: number) => new Promise((res) => setTimeout(res, ms));
-const onPageChange = async () => {
-	if (location.pathname !== '/watch') return;
-
-	/* ---------------------- apply settings ---------------------- */
-
-	const aboveTheFold = await untilAppear(getAboveTheFold);
-	const channelUsername = await untilChannelUsernameAppear(aboveTheFold);
-
-	channelConfig = cfg.channels[channelUsername] ||= {};
-
-	await plr.set(await untilAppear(getPlr));
-
-	applySettings(
-		computeSettings(
-			cfg.flags.standardMusicSpeed && isMusicChannel(aboveTheFold)
-		)
-	);
-
-	/* ---------------------- settings menu ---------------------- */
-
-	if (menu.element) {
-		menuControls.updateThisChannel();
-		return;
-	}
-
+const createMenu = async (updateChannelConfig: () => void) => {
 	menu.element = div({
 		id: MENU_ID,
 	});
@@ -764,7 +739,7 @@ const onPageChange = async () => {
 					updateCfg(newCfg);
 					localStorage[STORAGE_NAME] = raw;
 					cfg = newCfg;
-					channelConfig = cfg.channels[channelUsername] ||= {};
+					updateChannelConfig();
 				} catch (e) {
 					updateControlStatus('Import: ' + e.message);
 					return;
@@ -816,6 +791,34 @@ const onPageChange = async () => {
 	sections.style.maxWidth = sections.offsetWidth + 'px';
 };
 
+const delay = (ms: number) => new Promise((res) => setTimeout(res, ms));
+const onPageChange = async () => {
+	if (location.pathname !== '/watch') return;
+
+	const aboveTheFold = await untilAppear(getAboveTheFold);
+	const channelUsername = await untilChannelUsernameAppear(aboveTheFold);
+
+	const updateChannelConfig = () => {
+		channelConfig = cfg.channels[channelUsername] ||= {};
+	};
+
+	updateChannelConfig();
+
+	await plr.set(await untilAppear(getPlr));
+
+	applySettings(
+		computeSettings(
+			cfg.flags.standardMusicSpeed && isMusicChannel(aboveTheFold)
+		)
+	);
+
+	if (menu.element) {
+		menuControls.updateThisChannel();
+	} else {
+		await createMenu(updateChannelConfig);
+	}
+};
+
 let lastHref: string;
 setInterval(() => {
 	if (lastHref !== location.href) {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "yt-defaulter",
 	"author": "GooseOb",
-	"version": "1.11.0-alpha.1",
+	"version": "1.11.0-alpha.2",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/GooseOb/YT-Defaulter.git"