From 4cb658dacaa59e88ca41d4983e08ef237f7093c2 Mon Sep 17 00:00:00 2001
From: TC <th-ch@users.noreply.github.com>
Date: Tue, 4 May 2021 21:29:39 +0200
Subject: [PATCH] Remove preload.js in plugin uses and use front plugin
 injection

---
 plugins/precise-volume/back.js    |  1 -
 plugins/precise-volume/front.js   | 27 +++++++++++++++++++++++++++
 plugins/precise-volume/preload.js | 28 ----------------------------
 preload.js                        |  6 ------
 4 files changed, 27 insertions(+), 35 deletions(-)
 delete mode 100644 plugins/precise-volume/preload.js

diff --git a/plugins/precise-volume/back.js b/plugins/precise-volume/back.js
index 93ebea9f..9546e077 100644
--- a/plugins/precise-volume/back.js
+++ b/plugins/precise-volume/back.js
@@ -13,7 +13,6 @@ module.exports = (win) => {
 	// did-finish-load is called after all elements finished loading, including said listeners
 	// Thats the reason the timing is controlled from main
 	win.webContents.once("did-finish-load", () => {
-		win.webContents.send("restoreAddEventListener");
 		win.webContents.send("setupVideoPlayerVolumeMousewheel", !isEnabled("hide-video-player"));
 	});
 };
diff --git a/plugins/precise-volume/front.js b/plugins/precise-volume/front.js
index a1b30fe4..38fd5fc2 100644
--- a/plugins/precise-volume/front.js
+++ b/plugins/precise-volume/front.js
@@ -5,6 +5,7 @@ const { setOptions } = require("../../config/plugins");
 function $(selector) { return document.querySelector(selector); }
 
 module.exports = (options) => {
+	overrideAddEventListener();
 
 	setupPlaybar(options);
 
@@ -22,9 +23,35 @@ module.exports = (options) => {
 	ipcRenderer.once("setupVideoPlayerVolumeMousewheel", (_event, toEnable) => {
 		if (toEnable)
 			setupVideoPlayerOnwheel(options);
+		// Restore original function after did-finish-load to avoid keeping Element.prototype altered
+		Element.prototype.addEventListener = Element.prototype._addEventListener;
 	});
 };
 
+// Override specific listeners of volume-slider by modifying Element.prototype
+function overrideAddEventListener() {
+	// Events to ignore
+	const nativeEvents = ["mousewheel", "keydown", "keyup"];
+	// Save native addEventListener
+	Element.prototype._addEventListener = Element.prototype.addEventListener;
+	// Override addEventListener to Ignore specific events in volume-slider
+	Element.prototype.addEventListener = function (
+		type,
+		listener,
+		useCapture = false
+	) {
+		if (this.tagName === "TP-YT-PAPER-SLIDER") {
+			// tagName of #volume-slider
+			for (const eventType of nativeEvents) {
+				if (eventType === type) {
+					return;
+				}
+			}
+		} //else
+		this._addEventListener(type, listener, useCapture);
+	};
+}
+
 /** Add onwheel event to video player */
 function setupVideoPlayerOnwheel(options) {
 	$("#main-panel").addEventListener("wheel", event => {
diff --git a/plugins/precise-volume/preload.js b/plugins/precise-volume/preload.js
deleted file mode 100644
index bfd6a01c..00000000
--- a/plugins/precise-volume/preload.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const { ipcRenderer } = require("electron");
-
-// Override specific listeners of volume-slider by modifying Element.prototype
-function overrideAddEventListener() {
-    // Events to ignore
-    const nativeEvents = ["mousewheel", "keydown", "keyup"];
-    // Save native addEventListener
-    Element.prototype._addEventListener = Element.prototype.addEventListener;
-    // Override addEventListener to Ignore specific events in volume-slider
-    Element.prototype.addEventListener = function (type, listener, useCapture = false) {
-        if (this.tagName === "TP-YT-PAPER-SLIDER") { // tagName of #volume-slider
-            for (const eventType of nativeEvents) {
-                if (eventType === type) {
-                    return;
-                }
-            }
-        }//else
-        this._addEventListener(type, listener, useCapture);
-    };
-}
-
-module.exports = () => {
-    overrideAddEventListener();
-    // Restore original function after did-finish-load to avoid keeping Element.prototype altered
-    ipcRenderer.once("restoreAddEventListener", () => { //called from Main to make sure page is completly loaded
-        Element.prototype.addEventListener = Element.prototype._addEventListener;
-    });
-};
diff --git a/preload.js b/preload.js
index 500bda8d..fae01d96 100644
--- a/preload.js
+++ b/preload.js
@@ -8,12 +8,6 @@ const { fileExists } = require("./plugins/utils");
 const plugins = config.plugins.getEnabled();
 
 plugins.forEach(([plugin, options]) => {
-	const preloadPath = path.join(__dirname, "plugins", plugin, "preload.js");
-	fileExists(preloadPath, () => {
-		const run = require(preloadPath);
-		run(options);
-	});
-
 	const actionPath = path.join(__dirname, "plugins", plugin, "actions.js");
 	fileExists(actionPath, () => {
 		const actions = require(actionPath).actions || {};