Merge pull request #253 from Araxeus/fix-precise-volume-listener-override

Fix precise volume listener override
This commit is contained in:
th-ch
2021-05-06 21:45:09 +02:00
committed by GitHub
2 changed files with 19 additions and 13 deletions

View File

@ -194,12 +194,13 @@ function setupLocalArrowShortcuts(options) {
} }
function callback(event) { function callback(event) {
event.preventDefault();
switch (event.code) { switch (event.code) {
case "ArrowUp": case "ArrowUp":
event.preventDefault();
changeVolume(true, options); changeVolume(true, options);
break; break;
case "ArrowDown": case "ArrowDown":
event.preventDefault();
changeVolume(false, options); changeVolume(false, options);
break; break;
} }

View File

@ -1,28 +1,33 @@
const { ipcRenderer } = require("electron"); const { ipcRenderer } = require("electron");
const is = require("electron-is");
let ignored = {
id: ["volume-slider", "expand-volume-slider"],
types: ["mousewheel", "keydown", "keyup"]
};
// Override specific listeners of volume-slider by modifying Element.prototype
function overrideAddEventListener() { function overrideAddEventListener() {
// Events to ignore
const nativeEvents = ["mousewheel", "keydown", "keyup"];
// Save native addEventListener // Save native addEventListener
Element.prototype._addEventListener = Element.prototype.addEventListener; Element.prototype._addEventListener = Element.prototype.addEventListener;
// Override addEventListener to Ignore specific events in volume-slider // Override addEventListener to Ignore specific events in volume-slider
Element.prototype.addEventListener = function (type, listener, useCapture = false) { Element.prototype.addEventListener = function (type, listener, useCapture = false) {
if (this.tagName === "TP-YT-PAPER-SLIDER") { // tagName of #volume-slider if (!(
for (const eventType of nativeEvents) { ignored.id.includes(this.id) &&
if (eventType === type) { ignored.types.includes(type)
return; )) {
} this._addEventListener(type, listener, useCapture);
} } else if (is.dev()) {
}//else console.log(`Ignoring event: "${this.id}.${type}()"`);
this._addEventListener(type, listener, useCapture); }
}; };
} }
module.exports = () => { module.exports = () => {
overrideAddEventListener(); overrideAddEventListener();
// Restore original function after did-finish-load to avoid keeping Element.prototype altered // 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 ipcRenderer.once("restoreAddEventListener", () => { // Called from main to make sure page is completly loaded
Element.prototype.addEventListener = Element.prototype._addEventListener; Element.prototype.addEventListener = Element.prototype._addEventListener;
Element.prototype._addEventListener = undefined;
ignored = undefined;
}); });
}; };