Mirror/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2025-12-07 20:17:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed mod keys when setting keybinding

Browse Source
This commit is contained in:
Joe-Dowd
2020-03-20 19:39:37 +00:00
parent da5a3841bd
commit c78e2cd214
1 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/options.ts
View File

@@ -307,7 +307,7 @@ function activateKeybindChange(element: HTMLElement) {
element.querySelector(".option-hidden-section").classList.remove("hidden"); element.querySelector(".option-hidden-section").classList.remove("hidden");
document.addEventListener("keydown", (e) => keybindKeyPressed(element, e), {once: true}); document.addEventListener("keydown", (e) => keybindKeyPressed(element, e), {once: true});
} }
/** /**
@@ -318,46 +318,49 @@ function activateKeybindChange(element: HTMLElement) {
*/ */
function keybindKeyPressed(element: HTMLElement, e: KeyboardEvent) { function keybindKeyPressed(element: HTMLElement, e: KeyboardEvent) {
var key = e.key; var key = e.key;
if (["Shift", "Control", "Meta", "Alt"].indexOf(key) !== -1) {
document.addEventListener("keydown", (e) => keybindKeyPressed(element, e), {once: true});
} else {
let button = element.querySelector(".trigger-button");
let option = element.getAttribute("sync-option");
let button = element.querySelector(".trigger-button"); // Don't allow keys which are already listened for by youtube
let option = element.getAttribute("sync-option"); let restrictedKeys = "1234567890,.jklftcbmJKLFTCBM/<> -";
if (restrictedKeys.indexOf(key) !== -1 ) {
element.querySelector(".option-hidden-section").classList.add("hidden");
button.classList.remove("disabled");
alert("The key " + key + " is already used by youtube. Please select another key.");
return;
}
// Make sure keybind isn't used by the other listener
// TODO: If other keybindings are going to be added, we need a better way to find the other keys used.
let otherKeybind = (option === "startSponsorKeybind") ? Config.config['submitKeybind'] : Config.config['startSponsorKeybind'];
if (key === otherKeybind) {
element.querySelector(".option-hidden-section").classList.add("hidden");
button.classList.remove("disabled");
alert("The key " + key + " is bound to another action. Please select another key.");
return;
}
// cancel setting a keybind
if (key === "Escape") {
element.querySelector(".option-hidden-section").classList.add("hidden");
button.classList.remove("disabled");
return;
}
Config.config[option] = key;
let status = <HTMLElement> element.querySelector(".option-hidden-section > .keybind-status");
status.innerText = chrome.i18n.getMessage("keybindDescriptionComplete");
let statusKey = <HTMLElement> element.querySelector(".option-hidden-section > .keybind-status-key");
statusKey.innerText = key;
// Don't allow keys which are already listened for by youtube
let restrictedKeys = Array.from("1234567890,.jklfcbm/<> -").concat(["Shift"]);
if (restrictedKeys.indexOf(key) !== -1 ) {
element.querySelector(".option-hidden-section").classList.add("hidden");
button.classList.remove("disabled"); button.classList.remove("disabled");
alert("The key '" + key + "' is already used by youtube. Please select another key.");
return;
} }
// Make sure keybind isn't used by the other listener
// TODO: If other keybindings are going to be added, we need a better way to find the other keys used.
let otherKeybind = (option === "startSponsorKeybind") ? Config.config['submitKeybind'] : Config.config['startSponsorKeybind'];
if (key === otherKeybind) {
element.querySelector(".option-hidden-section").classList.add("hidden");
button.classList.remove("disabled");
alert("The key '" + key + "' is bound to another action. Please select another key.");
return;
}
// cancel setting a keybind
if (key === "Escape") {
element.querySelector(".option-hidden-section").classList.add("hidden");
button.classList.remove("disabled");
return;
}
Config.config[option] = key;
let status = <HTMLElement> element.querySelector(".option-hidden-section > .keybind-status");
status.innerText = chrome.i18n.getMessage("keybindDescriptionComplete");
let statusKey = <HTMLElement> element.querySelector(".option-hidden-section > .keybind-status-key");
statusKey.innerText = key;
button.classList.remove("disabled");
} }
/** /**