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

Merge branch 'experimental' into patch-24

Browse Source
This commit is contained in:
Ajay Ramachandran
2019-08-24 14:03:04 -04:00
committed by GitHub
parent 5802e05228 519a822751
commit 8604788d27
4 changed files with 62 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
content.js
View File

@@ -666,9 +666,12 @@ function isSubmitButtonLoaded() {
return document.getElementById("submitButton") !== null; return document.getElementById("submitButton") !== null;
} }
function changeStartSponsorButton(showStartSponsor, uploadButtonVisible) { async function changeStartSponsorButton(showStartSponsor, uploadButtonVisible) {
if(!sponsorVideoID) return false; if(!sponsorVideoID) return false;
wait(isSubmitButtonLoaded).then(result => {
//make sure submit button is loaded
await wait(isSubmitButtonLoaded);
//if it isn't visible, there is no data //if it isn't visible, there is no data
let shouldHide = (uploadButtonVisible && !hideDeleteButtonPlayerControls) ? "unset" : "none" let shouldHide = (uploadButtonVisible && !hideDeleteButtonPlayerControls) ? "unset" : "none"
document.getElementById("deleteButton").style.display = shouldHide; document.getElementById("deleteButton").style.display = shouldHide;
@@ -692,7 +695,6 @@ function changeStartSponsorButton(showStartSponsor, uploadButtonVisible) {
//disable submit button //disable submit button
document.getElementById("submitButton").style.display = "none"; document.getElementById("submitButton").style.display = "none";
} }
});
} }
function toggleStartSponsorButton() { function toggleStartSponsorButton() {
@@ -896,7 +898,7 @@ function submitSponsorTimes() {
//called after all the checks have been made that it's okay to do so //called after all the checks have been made that it's okay to do so
function sendSubmitMessage(){ function sendSubmitMessage(){
//add loading animation //add loading animation
document.getElementById("submitButtonImage").src = chrome.extension.getURL("icons/PlayerUploadIconSponsorBlocker256px.png"); document.getElementById("submitImage").src = chrome.extension.getURL("icons/PlayerUploadIconSponsorBlocker256px.png");
document.getElementById("submitButton").style.animation = "rotate 1s 0s infinite"; document.getElementById("submitButton").style.animation = "rotate 1s 0s infinite";
let currentVideoID = sponsorVideoID; let currentVideoID = sponsorVideoID;
@@ -931,7 +933,7 @@ function sendSubmitMessage(){
} else { } else {
//show that the upload failed //show that the upload failed
document.getElementById("submitButton").style.animation = "unset"; document.getElementById("submitButton").style.animation = "unset";
document.getElementById("submitButtonImage").src = chrome.extension.getURL("icons/PlayerUploadFailedIconSponsorBlocker256px.png"); document.getElementById("submitImage").src = chrome.extension.getURL("icons/PlayerUploadFailedIconSponsorBlocker256px.png");
if([400,429,409,502].includes(response.statusCode)) { if([400,429,409,502].includes(response.statusCode)) {
alert(chrome.i18n.getMessage(response.statusCode)); alert(chrome.i18n.getMessage(response.statusCode));

2
manifest.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "__MSG_fullName__", "name": "__MSG_fullName__",
"short_name": "__MSG_Name__", "short_name": "__MSG_Name__",
"version": "1.1.4", "version": "1.1.6",
"default_locale": "en", "default_locale": "en",
"description": "__MSG_Description__", "description": "__MSG_Description__",
"content_scripts": [ "content_scripts": [

14
utils.js
View File

@@ -1,14 +1,20 @@
// Function that can be used to wait for a condition before returning // Function that can be used to wait for a condition before returning
async function wait(condition, timeout = 5000, check = 100) { async function wait(condition, timeout = 5000, check = 100) {
return await new Promise((resolve, reject) => { return await new Promise((resolve, reject) => {
setTimeout(() => {reject("TIMEOUT")}, timeout); setTimeout(() => reject("TIMEOUT"), timeout);
const interval = setInterval(() => {
let intervalCheck = () => {
let result = condition(); let result = condition();
if (result !== false) { if (result !== false) {
resolve(result); resolve(result);
clearInterval(interval); clearInterval(interval);
}; };
}, check); };
let interval = setInterval(intervalCheck, check);
//run the check once first, this speeds it up a lot
intervalCheck();
}); });
} }
@@ -37,6 +43,7 @@ function getYouTubeVideoID(url) {
return false; return false;
} }
} }
return false; return false;
} }
@@ -59,3 +66,4 @@ function localizeHtmlPage() {
} }
} }
} }