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

Add keybind for submitting instead of just using the submission menu

Browse Source
This commit is contained in:
Ajay
2023-12-22 11:41:35 -05:00
parent 5ac19eecd4
commit 157216148c
6 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/content.ts
View File

@@ -251,7 +251,7 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
break;
case "submitTimes":
submitSponsorTimes();
openSubmissionMenu();
break;
case "refreshSegments":
// update video on refresh if videoID invalid
@@ -312,7 +312,7 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
updateEditButtonsOnPlayer();
updateSponsorTimesSubmitting(false);
submitSponsorTimes();
openSubmissionMenu();
}
sendResponse({
@@ -1816,7 +1816,7 @@ async function createButtons(): Promise<void> {
createButton("startSegment", "sponsorStart", () => startOrEndTimingNewSegment(), "PlayerStartIconSponsorBlocker.svg");
createButton("cancelSegment", "sponsorCancel", () => cancelCreatingSegment(), "PlayerCancelSegmentIconSponsorBlocker.svg");
createButton("delete", "clearTimes", () => clearSponsorTimes(), "PlayerDeleteIconSponsorBlocker.svg");
createButton("submit", "OpenSubmissionMenu", () => submitSponsorTimes(), "PlayerUploadIconSponsorBlocker.svg");
createButton("submit", "OpenSubmissionMenu", () => openSubmissionMenu(), "PlayerUploadIconSponsorBlocker.svg");
createButton("info", "openPopup", () => openInfoMenu(), "PlayerInfoIconSponsorBlocker.svg");
const controlsContainer = getControls();
@@ -2227,10 +2227,14 @@ function resetSponsorSubmissionNotice(callRef = true) {
submissionNotice = null;
}
function submitSponsorTimes() {
function closeSubmissionMenu() {
submissionNotice?.close();
submissionNotice = null;
}
function openSubmissionMenu() {
if (submissionNotice !== null){
submissionNotice.close();
submissionNotice = null;
closeSubmissionMenu();
return;
}
@@ -2240,6 +2244,15 @@ function submitSponsorTimes() {
}
function submitSegments() {
if (sponsorTimesSubmitting !== undefined
&& sponsorTimesSubmitting.length > 0
&& submissionNotice !== null) {
submissionNotice.submit();
}
}
//send the message to the background js
//called after all the checks have been made that it's okay to do so
async function sendSubmitMessage() {
@@ -2446,7 +2459,8 @@ function hotkeyListener(e: KeyboardEvent): void {
const skipKey = Config.config.skipKeybind;
const skipToHighlightKey = Config.config.skipToHighlightKeybind;
const startSponsorKey = Config.config.startSponsorKeybind;
const submitKey = Config.config.submitKeybind;
const submitKey = Config.config.actuallySubmitKeybind;
const openSubmissionMenuKey = Config.config.submitKeybind;
const nextChapterKey = Config.config.nextChapterKeybind;
const previousChapterKey = Config.config.previousChapterKeybind;
@@ -2466,7 +2480,10 @@ function hotkeyListener(e: KeyboardEvent): void {
startOrEndTimingNewSegment();
return;
} else if (keybindEquals(key, submitKey)) {
submitSponsorTimes();
submitSegments();
return;
} else if (keybindEquals(key, openSubmissionMenuKey)) {
openSubmissionMenu();
return;
} else if (keybindEquals(key, nextChapterKey)) {
if (sponsorTimes.length > 0) e.stopPropagation();
@@ -2485,7 +2502,7 @@ function hotkeyListener(e: KeyboardEvent): void {
} else if (key.key == startSponsorKey?.key && startSponsorKey.code == null && !keybindEquals(Config.syncDefaults.startSponsorKeybind, startSponsorKey)) {
startOrEndTimingNewSegment();
} else if (key.key == submitKey?.key && submitKey.code == null && !keybindEquals(Config.syncDefaults.submitKeybind, submitKey)) {
submitSponsorTimes();
openSubmissionMenu();
}
}