Add animation to refresh segments

Closes https://github.com/ajayyy/SponsorBlock/issues/839
This commit is contained in:
Ajay Ramachandran
2021-07-13 18:12:45 -04:00
parent 572fee265d
commit 76b78ef132
3 changed files with 94 additions and 77 deletions

View File

@@ -123,7 +123,7 @@ 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);
function messageListener(request: Message, sender: unknown, sendResponse: (response: MessageResponse) => void): void { async function messageListener(request: Message, sender: unknown, sendResponse: (response: MessageResponse) => void): Promise<void> {
//messages from popup script //messages from popup script
switch(request.message){ switch(request.message){
case "update": case "update":
@@ -179,7 +179,8 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
submitSponsorTimes(); submitSponsorTimes();
break; break;
case "refreshSegments": case "refreshSegments":
sponsorsLookup(sponsorVideoID, false); await sponsorsLookup(sponsorVideoID, false);
sendResponse({});
break; break;
} }
} }
@@ -594,9 +595,10 @@ async function sponsorsLookup(id: string, keepOldSubmissions = true) {
// Check for hashPrefix setting // Check for hashPrefix setting
const hashPrefix = (await utils.getHash(id, 1)).substr(0, 4); const hashPrefix = (await utils.getHash(id, 1)).substr(0, 4);
utils.asyncRequestToServer('GET', "/api/skipSegments/" + hashPrefix, { const response = await utils.asyncRequestToServer('GET', "/api/skipSegments/" + hashPrefix, {
categories categories
}).then(async (response: FetchResponse) => { });
if (response?.ok) { if (response?.ok) {
const recievedSegments: SponsorTime[] = JSON.parse(response.responseText) const recievedSegments: SponsorTime[] = JSON.parse(response.responseText)
?.filter((video) => video.videoID === id) ?.filter((video) => video.videoID === id)
@@ -668,7 +670,6 @@ async function sponsorsLookup(id: string, keepOldSubmissions = true) {
sponsorLookupRetries++; sponsorLookupRetries++;
} }
});
} }
function retryFetch(): void { function retryFetch(): void {

View File

@@ -53,5 +53,6 @@ export type MessageResponse =
| GetVideoIdResponse | GetVideoIdResponse
| GetChannelIDResponse | GetChannelIDResponse
| SponsorStartResponse | SponsorStartResponse
| IsChannelWhitelistedResponse; | IsChannelWhitelistedResponse
| Record<string, never>;

View File

@@ -679,13 +679,28 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
} }
function refreshSegments() { function refreshSegments() {
PageElements.refreshSegmentsButton.style.animation = "rotate 0.3s 0s infinite";
messageHandler.query({ messageHandler.query({
active: true, active: true,
currentWindow: true currentWindow: true
}, tabs => { }, tabs => {
messageHandler.sendMessage( messageHandler.sendMessage(
tabs[0].id, tabs[0].id,
{message: 'refreshSegments'} {message: 'refreshSegments'},
() => {
// Make the animation finite
PageElements.refreshSegmentsButton.style.animation = "rotate 0.3s";
// When the animation is over, hide the button
const animationEndListener = () => {
PageElements.refreshSegmentsButton.style.animation = "none";
PageElements.refreshSegmentsButton.removeEventListener("animationend", animationEndListener);
};
PageElements.refreshSegmentsButton.addEventListener("animationend", animationEndListener);
}
)} )}
); );
} }