fix: helper scrips position

WolfgangDS · Jun 25, 2021 · 03c35d4 · 03c35d4
1 parent 5107e1d
commit 03c35d4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/src/apply/apply.go b/src/apply/apply.go
@@ -73,30 +73,34 @@ func htmlMod(htmlPath string, flags Flag) {
 		return
 	}
 
-	extensionsHTML := ""
+	extensionsHTML := "\n"
+	helperHTML := "\n"
 
 	if flags.SidebarConfig {
-		extensionsHTML += `<script src="helper/sidebarConfig.js"></script>` + "\n"
+		helperHTML += `<script defer src="helper/sidebarConfig.js"></script>` + "\n"
 	}
 
 	if flags.HomeConfig {
-		extensionsHTML += `<script src="helper/homeConfig.js"></script>` + "\n"
+		helperHTML += `<script defer src="helper/homeConfig.js"></script>` + "\n"
 	}
 
 	for _, v := range flags.Extension {
 		if strings.HasSuffix(v, ".mjs") {
-			extensionsHTML += `<script type="module" src="extensions/` + v + `"></script>` + "\n"
+			extensionsHTML += `<script defer type="module" src="extensions/` + v + `"></script>` + "\n"
 		} else {
-			extensionsHTML += `<script src="extensions/` + v + `"></script>` + "\n"
+			extensionsHTML += `<script defer src="extensions/` + v + `"></script>` + "\n"
 		}
 	}
 
 	utils.ModifyFile(htmlPath, func(content string) string {
+		utils.Replace(
+			&content,
+			`<\!-- spicetify helpers -->`,
+			"${0}"+helperHTML)
 		utils.Replace(
 			&content,
 			`</body>`,
-			extensionsHTML+"${0}",
-		)
+			extensionsHTML+"${0}")
 		return content
 	})
 }

diff --git a/src/preprocess/preprocess.go b/src/preprocess/preprocess.go
@@ -119,7 +119,8 @@ func Start(extractedAppsPath string, flags Flag) {
 
 				var tags string
 				if flags.ExposeAPIs {
-					tags += `<script src="helper/spicetifyWrapper.js"></script>`
+					tags += `<script src="helper/spicetifyWrapper.js"></script>` + "\n"
+					tags += `<!-- spicetify helpers -->` + "\n"
 				}
 
 				utils.Replace(&content, `<body>`, "${0}\n"+tags)
@@ -379,18 +380,18 @@ func exposeAPIs_vendor(input string) string {
 		&input,
 		`\w+\("onMount",\[(\w+)\]\)`,
 		`${0};
-if (G.popper?.firstChild?.id === "context-menu") {
-    const container = G.popper.firstChild;
+if (${1}.popper?.firstChild?.id === "context-menu") {
+    const container = ${1}.popper.firstChild;
 	if (!container.children.length) {
 		const observer = new MutationObserver(() => {
-			Spicetify.ContextMenu._addItems(G.popper);
+			Spicetify.ContextMenu._addItems(${1}.popper);
 			observer.disconnect();
 		});
 		observer.observe(container, { childList: true });
     } else if (container.firstChild.classList.contains("main-userWidget-dropDownMenu")) {
-        Spicetify.Menu._addItems(G.popper);
+        Spicetify.Menu._addItems(${1}.popper);
     } else {
-		Spicetify.ContextMenu._addItems(G.popper);
+		Spicetify.ContextMenu._addItems(${1}.popper);
 	}
 };0`)