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

Switch hotkeys to not use array

Browse Source
This commit is contained in:
Ajay
2022-02-27 20:17:19 -05:00
parent f6d2497e7b
commit a1caf8fbdb
1 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/content.ts
View File

@@ -138,9 +138,6 @@ const manualSkipPercentCount = 0.5;
//get messages from the background script and the popup //get messages from the background script and the popup
chrome.runtime.onMessage.addListener(messageListener); chrome.runtime.onMessage.addListener(messageListener);
//store pressed modifier keys
const pressedKeys = new Set();
function messageListener(request: Message, sender: unknown, sendResponse: (response: MessageResponse) => void): void | boolean { function messageListener(request: Message, sender: unknown, sendResponse: (response: MessageResponse) => void): void | boolean {
//messages from popup script //messages from popup script
switch(request.message){ switch(request.message){
@@ -1987,37 +1984,34 @@ function addPageListeners(): void {
function addHotkeyListener(): void { function addHotkeyListener(): void {
document.addEventListener("keydown", hotkeyListener); document.addEventListener("keydown", hotkeyListener);
document.addEventListener("keyup", (e) => pressedKeys.delete(e.key));
window.addEventListener("focus", (e) => pressedKeys.clear());
} }
function hotkeyListener(e: KeyboardEvent): void { function hotkeyListener(e: KeyboardEvent): void {
if (["textarea", "input"].includes(document.activeElement?.tagName?.toLowerCase()) if (["textarea", "input"].includes(document.activeElement?.tagName?.toLowerCase())
|| document.activeElement?.id?.toLowerCase()?.includes("editable")) return; || document.activeElement?.id?.toLowerCase()?.includes("editable")) return;
if (["Alt", "Control", "Shift", "AltGraph"].includes(e.key)) { const key: Keybind = {
pressedKeys.add(e.key); key: e.key,
return; code: e.code,
} alt: e.altKey,
ctrl: e.ctrlKey,
const key:Keybind = {key: e.key, code: e.code, alt: pressedKeys.has("Alt"), ctrl: pressedKeys.has("Control"), shift: pressedKeys.has("Shift")}; shift: e.shiftKey
};
const skipKey = Config.config.skipKeybind; const skipKey = Config.config.skipKeybind;
const startSponsorKey = Config.config.startSponsorKeybind; const startSponsorKey = Config.config.startSponsorKeybind;
const submitKey = Config.config.submitKeybind; const submitKey = Config.config.submitKeybind;
if (!pressedKeys.has("AltGraph")) { if (keybindEquals(key, skipKey)) {
if (keybindEquals(key, skipKey)) { if (activeSkipKeybindElement)
if (activeSkipKeybindElement) activeSkipKeybindElement.toggleSkip.call(activeSkipKeybindElement);
activeSkipKeybindElement.toggleSkip.call(activeSkipKeybindElement); return;
return; } else if (keybindEquals(key, startSponsorKey)) {
} else if (keybindEquals(key, startSponsorKey)) { startOrEndTimingNewSegment();
startOrEndTimingNewSegment(); return;
return; } else if (keybindEquals(key, submitKey)) {
} else if (keybindEquals(key, submitKey)) { submitSponsorTimes();
submitSponsorTimes(); return;
return;
}
} }
//legacy - to preserve keybinds for skipKey, startSponsorKey and submitKey for people who set it before the update. (shouldn't be changed for future keybind options) //legacy - to preserve keybinds for skipKey, startSponsorKey and submitKey for people who set it before the update. (shouldn't be changed for future keybind options)