Merge pull request #139 from ajayyy/experimental-ajay

Fixed preview bar causing issues

README.md

@@ -14,6 +14,7 @@
   <a href="https://sponsor.ajay.app/stats">Stats</a>
 </p>
 
+[![](https://img.shields.io/amo/users/sponsorblock?label=Firefox%20Users)](https://addons.mozilla.org/addon/sponsorblock/?src=external-github) [![](https://img.shields.io/chrome-web-store/users/mnjggcdmjocbbbhaepdhchncahnbgone?label=Chome%20Users)](https://chrome.google.com/webstore/detail/mnjggcdmjocbbbhaepdhchncahnbgone)
 
 SponsorBlock is an extension that will skip over sponsored segments of YouTube videos. SponsorBlock is a crowdsourced browser extension that lets anyone submit the start and end times of sponsored segments of YouTube videos. Once one person submits this information, everyone else with this extension will skip right over the sponsored segment.
 

_locales/en/messages.json

@@ -135,5 +135,17 @@
     },
     "submitCheck": {
         "message": "Are you sure you want to submit this?"
+    },
+    "longDescription": {
+        "message": "SponsorBlock is an extension that will skip over sponsored segments of YouTube videos. SponsorBlock is a crowdsourced browser extension that let's anyone submit the start and end time's of sponsored segments of YouTube videos. Once one person submits this information, everyone else with this extension will skip right over the sponsored segment.",
+        "description": "Full description of the extension on the store pages."
+    },
+    "website": {
+        "message": "Website",
+        "description": "Used on Firefox Store Page"
+    },
+    "sourceCode": {
+        "message": "Source Code",
+        "description": "Used on Firefox Store Page"
     }
 }

content.js

@@ -238,8 +238,10 @@ function videoIDChange(id) {
     //setup the preview bar
     if (previewBar == null) {
         //create it
+        wait(getControls).then(result => {
             let progressBar = document.getElementsByClassName("ytp-progress-bar-container")[0] || document.getElementsByClassName("no-model cue-range-markers")[0];
             previewBar = new PreviewBar(progressBar);
+        });
     }
 
     //warn them if they had unsubmitted times
@@ -271,7 +273,7 @@ function videoIDChange(id) {
     sponsorsLookup(id);
 
     //make sure everything is properly added
-    updateVisibilityOfPlayerControlsButton(true);
+    updateVisibilityOfPlayerControlsButton();
 
     //reset sponsor times submitting
     sponsorTimesSubmitting = [];
@@ -412,7 +414,7 @@ function updatePreviewBar() {
         types.push("previewSponsor");
     }
 
-    previewBar.set(allSponsorTimes, types, v.duration);
+    wait(() => previewBar !== null).then((result) => previewBar.set(allSponsorTimes, types, v.duration));
 
     //update last video id
     lastPreviewBarUpdate = sponsorVideoID;
@@ -666,9 +668,12 @@ function isSubmitButtonLoaded() {
     return document.getElementById("submitButton") !== null;
 }
 
-function changeStartSponsorButton(showStartSponsor, uploadButtonVisible) {
+async function changeStartSponsorButton(showStartSponsor, uploadButtonVisible) {
     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
     let shouldHide = (uploadButtonVisible && !hideDeleteButtonPlayerControls) ? "unset" : "none"
     document.getElementById("deleteButton").style.display = shouldHide;
@@ -692,7 +697,6 @@ function changeStartSponsorButton(showStartSponsor, uploadButtonVisible) {
         //disable submit button
         document.getElementById("submitButton").style.display = "none";
     }
-	});
 }
 
 function toggleStartSponsorButton() {

manifest.json

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

utils.js

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