Merge pull request #59 from ajayyy/experimental

Moved notice, embed support and bug fixes

LICENSE

@@ -1,3 +1,7 @@
+SponsorBlock Copyright (C) 2019  Ajay Ramachandran and other SponsorBlock contributors.
+
+Please refer to the license below.
+                   
                      GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
@@ -653,6 +657,7 @@ Also add information on how to contact you by electronic and paper mail.
 notice like this when it starts in an interactive mode:
  
     <program>  Copyright (C) <year>  <name of author>
+    
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

README.md

@@ -7,7 +7,7 @@ SponsorBlock is an extension that will skip over sponsored segments of YouTube v
 
 # Available for Chrome and Firefox
 
-Chrome: https://chrome.google.com/webstore/detail/mnjggcdmjocbbbhaepdhchncahnbgone/
+Chrome: https://chrome.google.com/webstore/detail/ajjollijmimolcncegpgkbilohbhjnhi
 
 Firefox: https://addons.mozilla.org/addon/sponsorblock/
 
@@ -34,3 +34,5 @@ You can load this project as an unpacked extension. Make sure to rename the `con
 The awesome [Invidious API](https://github.com/omarroth/invidious/wiki/API) is used to grab the time the video was published.
 
 Some icons made by <a href="https://www.flaticon.com/authors/gregor-cresnar" title="Gregor Cresnar">Gregor Cresnar</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a> and are licensed by <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a>
+
+Some icons made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a> is licensed by <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a>

background.js

@@ -3,6 +3,9 @@ var previousVideoID = null
 //the id of this user, randomly generated once per install
 var userID = null;
 
+//the last video id loaded, to make sure it is a video id change
+var sponsorVideoID = null;
+
 //when a new tab is highlighted
 chrome.tabs.onActivated.addListener(
   function(activeInfo) {
@@ -54,6 +57,19 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
   }
 });
 
+//add help page on install
+chrome.runtime.onInstalled.addListener(function (object) {
+  chrome.storage.sync.get(["shownInstallPage"], function(result) {
+    let shownInstallPage = result.shownInstallPage;
+    if (shownInstallPage == undefined || !shownInstallPage) {
+      //open up the install page
+      chrome.tabs.create({url: chrome.extension.getURL("/help/index.html")});
+
+      //save that this happened
+      chrome.storage.sync.set({shownInstallPage: true});
+    }
+  });
+});
 
 //gets the sponsor times from memory
 function getSponsorTimes(videoID, callback) {
@@ -100,12 +116,14 @@ function submitVote(type, UUID, callback) {
       } else if (xmlhttp.readyState == 4 && xmlhttp.status == 405) {
         //duplicate vote
         callback({
-          successType: 0
+          successType: 0,
+          statusCode: xmlhttp.status
         });
       } else if (error) {
         //error while connect
         callback({
-          successType: -1
+          successType: -1,
+          statusCode: xmlhttp.status
         });
       }
     })
@@ -129,15 +147,8 @@ function submitTimes(videoID, callback) {
               callback({
                 statusCode: xmlhttp.status
               });
-            } else if (error) {
-              callback({
-                statusCode: -1
-              });
-            }
-          });
-        });
-      }
 
+              if (xmlhttp.status == 200) {
                 //add these to the storage log
                 chrome.storage.sync.get(["sponsorTimesContributed"], function(result) {
                   let currentContributionAmount = 0;
@@ -150,6 +161,15 @@ function submitTimes(videoID, callback) {
                   chrome.storage.sync.set({"sponsorTimesContributed": currentContributionAmount + sponsorTimes.length});
                 });
               }
+            } else if (error) {
+              callback({
+                statusCode: -1
+              });
+            }
+          });
+        });
+      }
+    }
   });
 }
 
@@ -160,6 +180,12 @@ function videoIDChange(currentVideoID, tabId) {
     id: currentVideoID
   });
 
+  //not a url change
+  if (sponsorVideoID == currentVideoID){
+    return;
+  }
+  sponsorVideoID = currentVideoID;
+
   //warn them if they had unsubmitted times
   if (previousVideoID != null) {
     //get the sponsor times from storage

content.css

@@ -1,3 +1,15 @@
+.popup {
+    z-index: 10;
+    width: 100%;
+    height: 500px;
+}
+
+.smallLink {
+	font-size: 10px;
+	text-decoration: underline;
+	cursor: pointer;
+}
+
 .playerButtonImage {
 	height: 60%;
 	top: 0;
@@ -33,18 +45,19 @@
     min-width: 400px;
     background-color: rgba(255, 217, 217, 0.8);
     position: absolute;
-	z-index: 1;
 	border: 3px solid rgba(0, 0, 0, 0.8);
-	margin-top: -50px;
+	right: 0;
+	bottom: 90px;
+	zoom: 85%;
 
 	animation: fadeIn 0.5s;
 }
 
 /* if two are very close to eachother */
 .secondSkipNotice {
-	margin-left: 500px;
+	bottom: 280px;
 
-  	transition: margin-left 0.2s;
+  	transition: bottom 0.2s;
 }
 
 .sponsorSkipMessage {

content.js

@@ -31,6 +31,19 @@ var showingStartSponsor = true;
 
 //should the video controls buttons be added
 var hideVideoPlayerControls = false;
+var hideInfoButtonPlayerControls = false;
+var hideDeleteButtonPlayerControls = false;
+
+//the downloaded sponsor times
+var sponsorTimes = [];
+var UUIDs = [];
+
+//the sponsor times being prepared to be submitted
+var sponsorTimesSubmitting = [];
+
+//becomes true when isInfoFound is called
+//this is used to close the popup on YouTube when the other popup opens
+var popupInitialised = false;
 
 //should view counts be tracked
 var trackViewCount = false;
@@ -53,9 +66,10 @@ chrome.storage.sync.get(["dontShowNoticeAgain"], function(result) {
   }
 });
 
-chrome.runtime.onMessage.addListener( // Detect URL Changes
-  function(request, sender, sendResponse) {
-	  console.log(request.message)
+//get messages from the background script and the popup
+chrome.runtime.onMessage.addListener(messageListener);
+
+function messageListener(request, sender, sendResponse) {
     //message from background script
     if (request.message == "ytvideoid") { 
       videoIDChange(request.id);
@@ -63,7 +77,11 @@ chrome.runtime.onMessage.addListener( // Detect URL Changes
 
     //messages from popup script
     if (request.message == "sponsorStart") {
-      sponsorMessageStarted();
+      sponsorMessageStarted(sendResponse);
+    }
+
+    if (request.message == "sponsorDataChanged") {
+      updateSponsorTimesSubmitting();
     }
 
     if (request.message == "isInfoFound") {
@@ -72,7 +90,14 @@ chrome.runtime.onMessage.addListener( // Detect URL Changes
         found: sponsorDataFound,
         sponsorTimes: sponsorTimes,
         UUIDs: UUIDs
-      })
+      });
+
+      if (popupInitialised && document.getElementById("sponsorBlockPopupContainer") != null) {
+        //the popup should be closed now that another is opening
+        closeInfoMenu();
+      }
+
+      popupInitialised = true;
     }
 
     if (request.message == "getVideoID") {
@@ -92,13 +117,21 @@ chrome.runtime.onMessage.addListener( // Detect URL Changes
     if (request.message == "changeVideoPlayerControlsVisibility") {
       hideVideoPlayerControls = request.value;
 
+      updateVisibilityOfPlayerControlsButton();
+    } else if (request.message == "changeInfoButtonPlayerControlsVisibility") {
+      hideInfoButtonPlayerControls = request.value;
+
+      updateVisibilityOfPlayerControlsButton();
+    } else if (request.message == "changeDeleteButtonPlayerControlsVisibility") {
+      hideDeleteButtonPlayerControls = request.value;
+
       updateVisibilityOfPlayerControlsButton();
     }
 
     if (request.message == "trackViewCount") {
       trackViewCount = request.value;
     }
-});
+}
 
 //check for hotkey pressed
 document.onkeydown = function(e){
@@ -138,6 +171,9 @@ function videoIDChange(id) {
   sponsorDataFound = false;
   sponsorsLookup(id);
 
+  //reset sponsor times submitting
+  sponsorTimesSubmitting = [];
+
   //see if the onvideo control image needs to be changed
   chrome.runtime.sendMessage({
     message: "getSponsorTimes",
@@ -150,13 +186,17 @@ function videoIDChange(id) {
       } else if (sponsorTimes != null && sponsorTimes.length > 0 && sponsorTimes[sponsorTimes.length - 1].length < 2) {
         changeStartSponsorButton(false, true);
       } else {
-        changeStartSponsorButton(true, true);
-        document.getElementById("submitButton").style.display = "none";
+        changeStartSponsorButton(true, false);
+      }
+
+      //see if this data should be saved in the sponsorTimesSubmitting variable
+      if (sponsorTimes != undefined && sponsorTimes.length > 0) {
+        sponsorTimesSubmitting = sponsorTimes;
       }
     }
   });
 
-  //see if video control buttons should be added
+  //see if video controls buttons should be added
   chrome.storage.sync.get(["hideVideoPlayerControls"], function(result) {
     if (result.hideVideoPlayerControls != undefined) {
       hideVideoPlayerControls = result.hideVideoPlayerControls;
@@ -164,6 +204,21 @@ function videoIDChange(id) {
 
     updateVisibilityOfPlayerControlsButton();
   });
+  chrome.storage.sync.get(["hideInfoButtonPlayerControls"], function(result) {
+    if (result.hideInfoButtonPlayerControls != undefined) {
+      hideInfoButtonPlayerControls = result.hideInfoButtonPlayerControls;
+    }
+
+    updateVisibilityOfPlayerControlsButton();
+  });
+  chrome.storage.sync.get(["hideDeleteButtonPlayerControls"], function(result) {
+    if (result.hideDeleteButtonPlayerControls != undefined) {
+      hideDeleteButtonPlayerControls = result.hideDeleteButtonPlayerControls;
+    }
+
+    updateVisibilityOfPlayerControlsButton();
+  });
+  
 }
 
 function sponsorsLookup(id) {
@@ -176,11 +231,6 @@ function sponsorsLookup(id) {
 
       sponsorTimes = JSON.parse(xmlhttp.responseText).sponsorTimes;
       UUIDs = JSON.parse(xmlhttp.responseText).UUIDs;
-
-        // If the sponsor data exists, add the event to run on the videos "ontimeupdate"
-        v.ontimeupdate = function () { 
-            sponsorCheck(sponsorTimes);
-        };
     } else if (xmlhttp.readyState == 4) {
       sponsorDataFound = false;
 
@@ -198,33 +248,83 @@ function sponsorsLookup(id) {
       });
     }
   });
+
+  //add the event to run on the videos "ontimeupdate"
+  v.ontimeupdate = function () { 
+    sponsorCheck();
+  };
 }
 
-function sponsorCheck(sponsorTimes) { // Video skipping
+//video skipping
+function sponsorCheck() {
+  let skipHappened = false;
+
+  if (sponsorTimes != null) {
     //see if any sponsor start time was just passed
     for (let i = 0; i < sponsorTimes.length; i++) {
+      //if something was skipped
+      if (checkSponsorTime(sponsorTimes, i, true)) {
+        skipHappened = true;
+        break;
+      }
+    }
+  }
+
+  if (!skipHappened) {
+    //check for the "preview" sponsors (currently edited by this user)
+    for (let i = 0; i < sponsorTimesSubmitting.length; i++) {
+      //must be a finished sponsor and be valid
+      if (sponsorTimesSubmitting[i].length > 1 && sponsorTimesSubmitting[i][1] > sponsorTimesSubmitting[i][0]) {
+        checkSponsorTime(sponsorTimesSubmitting, i, false);
+      }
+    }
+  }
+
+  //don't keep track until they are loaded in
+  if (sponsorTimes != null || sponsorTimesSubmitting.length > 0) {
+    lastTime = v.currentTime;
+  }
+}
+
+function checkSponsorTime(sponsorTimes, index, openNotice) {
   //this means part of the video was just skipped
   if (Math.abs(v.currentTime - lastTime) > 1 && lastTime != -1) {
     //make lastTime as if the video was playing normally
     lastTime = v.currentTime - 0.0001;
   }
 
+  if (checkIfTimeToSkip(v.currentTime, sponsorTimes[index][0])) {
+    //skip it
+    skipToTime(v, index, sponsorTimes, openNotice);
+
+    //something was skipped
+    return true;
+  }
+
+  return false;
+}
+
+function checkIfTimeToSkip(currentVideoTime, startTime) {
   let currentTime = Date.now();
 
   //If the sponsor time is in between these times, skip it
   //Checks if the last time skipped to is not too close to now, to make sure not to get too many
   //  sponsor times in a row (from one troll)
   //the last term makes 0 second start times possible
-    if ((Math.abs(v.currentTime - sponsorTimes[i][0]) < 0.3 && sponsorTimes[i][0] >= lastTime && sponsorTimes[i][0] <= v.currentTime
-          && (lastUnixTimeSkipped == -1 || currentTime - lastUnixTimeSkipped > 500)) || (lastTime == -1 && sponsorTimes[i][0] == 0)) {
-      //skip it
-      v.currentTime = sponsorTimes[i][1];
+  return (Math.abs(currentVideoTime - startTime) < 0.3 && startTime >= lastTime && startTime <= currentVideoTime && 
+      (lastUnixTimeSkipped == -1 || currentTime - lastUnixTimeSkipped > 500)) || (lastTime == -1 && startTime == 0);
+}
 
-      lastSponsorTimeSkipped = sponsorTimes[i][0];
+//skip fromt he start time to the end time for a certain index sponsor time
+function skipToTime(v, index, sponsorTimes, openNotice) {
+  v.currentTime = sponsorTimes[index][1];
 
-      let currentUUID =  UUIDs[i];
+  lastSponsorTimeSkipped = sponsorTimes[index][0];
+  
+  let currentUUID =  UUIDs[index];
   lastSponsorTimeSkippedUUID = currentUUID; 
 
+  if (openNotice) {
     //send out the message saying that a sponsor message was skipped
     openSkipNotice(currentUUID);
 
@@ -237,12 +337,6 @@ function sponsorCheck(sponsorTimes) { // Video skipping
   }
 }
 
-  //don't keep track until they are loaded in
-  if (sponsorTimes.length > 0) {
-    lastTime = v.currentTime;
-  }
-}
-
 function goBackToPreviousTime(UUID) {
   if (sponsorTimes != null) {
     //add a tiny bit of time to make sure it is not skipped again
@@ -286,13 +380,24 @@ function removePlayerControlsButton() {
 //adds or removes the player controls button to what it should be
 function updateVisibilityOfPlayerControlsButton() {
   addPlayerControlsButton();
+  addInfoButton();
+  addDeleteButton();
   addSubmitButton();
   if (hideVideoPlayerControls) {
     removePlayerControlsButton();
   }
+  if (hideInfoButtonPlayerControls) {
+    document.getElementById("infoButton").style.display = "none";
+  }
+  if (hideDeleteButtonPlayerControls) {
+    document.getElementById("deleteButton").style.display = "none";
+  }
 }
 
 function startSponsorClicked() {
+  //it can't update to this info yet
+  closeInfoMenu();
+
   toggleStartSponsorButton();
 
   //send back current time with message
@@ -300,16 +405,42 @@ function startSponsorClicked() {
     message: "addSponsorTime",
     time: v.currentTime,
     videoID: getYouTubeVideoID(document.URL)
+  }, function(response) {
+    //see if the sponsorTimesSubmitting needs to be updated
+    updateSponsorTimesSubmitting();
+  });
+}
+
+function updateSponsorTimesSubmitting() {
+  chrome.runtime.sendMessage({
+    message: "getSponsorTimes",
+    videoID: getYouTubeVideoID(document.URL)
+  }, function(response) {
+    if (response != undefined) {
+      let sponsorTimes = response.sponsorTimes;
+
+      //see if this data should be saved in the sponsorTimesSubmitting variable
+      if (sponsorTimes != undefined) {
+        sponsorTimesSubmitting = sponsorTimes;
+      }
+    }
   });
 }
 
 function changeStartSponsorButton(showStartSponsor, uploadButtonVisible) {
+  //if it isn't visible, there is no data
+  if (uploadButtonVisible && !hideDeleteButtonPlayerControls) {
+    document.getElementById("deleteButton").style.display = "unset";
+  } else {
+    document.getElementById("deleteButton").style.display = "none";
+  }
+
   if (showStartSponsor) {
     showingStartSponsor = true;
     document.getElementById("startSponsorImage").src = chrome.extension.getURL("icons/PlayerStartIconSponsorBlocker256px.png");
     document.getElementById("startSponsorButton").setAttribute("title", "Sponsor Starts Now");
 
-    if (document.getElementById("startSponsorImage").style.display != "none" && uploadButtonVisible) {
+    if (document.getElementById("startSponsorImage").style.display != "none" && uploadButtonVisible && !hideInfoButtonPlayerControls) {
       document.getElementById("submitButton").style.display = "unset";
     } else if (!uploadButtonVisible) {
       //disable submit button
@@ -329,6 +460,60 @@ function toggleStartSponsorButton() {
   changeStartSponsorButton(!showingStartSponsor, true);
 }
 
+//shows the info button on the video player
+function addInfoButton() {
+  if (document.getElementById("infoButton") != null) {
+    //it's already added
+    return;
+  }
+  
+  //make a submit button
+  let infoButton = document.createElement("button");
+  infoButton.id = "infoButton";
+  infoButton.className = "ytp-button playerButton";
+  infoButton.setAttribute("title", "Open SponsorBlock Popup");
+  infoButton.addEventListener("click", openInfoMenu);
+
+  let infoImage = document.createElement("img");
+  infoImage.id = "infoButtonImage";
+  infoImage.className = "playerButtonImage";
+  infoImage.src = chrome.extension.getURL("icons/PlayerInfoIconSponsorBlocker256px.png");
+
+  //add the image to the button
+  infoButton.appendChild(infoImage);
+
+  let referenceNode = document.getElementsByClassName("ytp-right-controls")[0];
+  referenceNode.prepend(infoButton);
+}
+
+//shows the delete button on the video player
+function addDeleteButton() {
+  if (document.getElementById("deleteButton") != null) {
+    //it's already added
+    return;
+  }
+  
+  //make a submit button
+  let deleteButton = document.createElement("button");
+  deleteButton.id = "deleteButton";
+  deleteButton.className = "ytp-button playerButton";
+  deleteButton.setAttribute("title", "Clear Sponsor Times");
+  deleteButton.addEventListener("click", clearSponsorTimes);
+  //hide it at the start
+  deleteButton.style.display = "none";
+
+  let deleteImage = document.createElement("img");
+  deleteImage.id = "deleteButtonImage";
+  deleteImage.className = "playerButtonImage";
+  deleteImage.src = chrome.extension.getURL("icons/PlayerDeleteIconSponsorBlocker256px.png");
+
+  //add the image to the button
+  deleteButton.appendChild(deleteImage);
+
+  let referenceNode = document.getElementsByClassName("ytp-right-controls")[0];
+  referenceNode.prepend(deleteButton);
+}
+
 //shows the submit button on the video player
 function addSubmitButton() {
   if (document.getElementById("submitButton") != null) {
@@ -357,6 +542,94 @@ function addSubmitButton() {
   referenceNode.prepend(submitButton);
 }
 
+function openInfoMenu() {
+  if (document.getElementById("sponsorBlockPopupContainer") != null) {
+    //it's already added
+    return;
+  }
+
+  popupInitialised = false;
+
+  //hide info button
+  document.getElementById("infoButton").style.display = "none";
+
+  sendRequestToCustomServer('GET', chrome.extension.getURL("popup.html"), function(xmlhttp) {
+    if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+      var popup = document.createElement("div");
+      popup.id = "sponsorBlockPopupContainer";
+      popup.innerHTML = xmlhttp.responseText
+
+      //close button
+      let closeButton = document.createElement("div");
+      closeButton.innerText = "Close Popup";
+      closeButton.classList = "smallLink";
+      closeButton.setAttribute("align", "center");
+      closeButton.addEventListener("click", closeInfoMenu);
+
+      //add the close button
+      popup.prepend(closeButton);
+    
+      let parentNode = document.getElementById("secondary");
+      if (parentNode == null) {
+        //old youtube theme
+        parentNode = document.getElementById("watch7-sidebar-contents");
+      }
+
+      //make the logo source not 404
+      //query selector must be used since getElementByID doesn't work on a node and this isn't added to the document yet
+      let logo = popup.querySelector("#sponsorBlockPopupLogo");
+      logo.src = chrome.extension.getURL("icons/LogoSponsorBlocker256px.png");
+
+      //remove the style sheet and font that are not necessary
+      popup.querySelector("#sponorBlockPopupFont").remove();
+      popup.querySelector("#sponorBlockStyleSheet").remove();
+
+      parentNode.insertBefore(popup, parentNode.firstChild);
+
+      //run the popup init script
+      runThePopup();
+    }
+  });
+}
+
+function closeInfoMenu() {
+  let popup = document.getElementById("sponsorBlockPopupContainer");
+  if (popup != null) {
+    popup.remove();
+
+    //show info button
+    document.getElementById("infoButton").style.display = "unset";
+  }
+}
+
+function clearSponsorTimes() {
+  //it can't update to this info yet
+  closeInfoMenu();
+
+  let currentVideoID = getYouTubeVideoID(document.URL);
+
+  let sponsorTimeKey = 'sponsorTimes' + currentVideoID;
+  chrome.storage.sync.get([sponsorTimeKey], function(result) {
+    let sponsorTimes = result[sponsorTimeKey];
+
+    if (sponsorTimes != undefined && sponsorTimes.length > 0) {
+      let confirmMessage = "Are you sure you want to clear this?\n\n" + getSponsorTimesMessage(sponsorTimes);
+      confirmMessage += "\n\nTo edit or delete individual values, click the info button or open the extension popup by clicking the extension icon in the top right corner."
+      if(!confirm(confirmMessage)) return;
+
+      //clear the sponsor times
+      let sponsorTimeKey = "sponsorTimes" + currentVideoID;
+      chrome.storage.sync.set({[sponsorTimeKey]: []});
+
+      //clear sponsor times submitting
+      sponsorTimesSubmitting = [];
+
+      //set buttons to be correct
+      changeStartSponsorButton(true, false);
+    }
+  });
+}
+
 //Opens the notice that tells the user that a sponsor was just skipped
 function openSkipNotice(UUID){
   if (dontShowNotice) {
@@ -364,29 +637,6 @@ function openSkipNotice(UUID){
     return;
   }
 
-  //check if page is loaded yet (for 0 second sponsors, the page might not be loaded yet)
-  //it looks for the view count div and sees if it is full yet
-  //querySelectorAll is being used like findElementById for multiple objects, because for
-  //some reason YouTube has put more than one object with one ID.
-  let viewCountNode = document.querySelectorAll("#count");
-  //check to see if the length is over zero, otherwise it's a different YouTube theme probably
-  if (viewCountNode.length > 0) {
-    //check if any of these have text
-    let viewCountVisible = false;
-    for (let i = 0; i < viewCountNode.length; i++) {
-      if (viewCountNode[i].innerText != null) {
-        viewCountVisible = true;
-        break;
-      }
-    }
-    if (!viewCountVisible) {
-      //this is the new YouTube layout and it is still loading
-      //wait a bit for opening the notice
-      setTimeout(() => openSkipNotice(UUID), 200);
-      return;
-    }
-  }
-
   let amountOfPreviousNotices = document.getElementsByClassName("sponsorSkipNotice").length;
 
   if (amountOfPreviousNotices > 0) {
@@ -401,7 +651,7 @@ function openSkipNotice(UUID){
   noticeElement.id = "sponsorSkipNotice" + UUID;
   noticeElement.classList.add("sponsorSkipObject");
   noticeElement.classList.add("sponsorSkipNotice");
-  noticeElement.style.zIndex = 5 + amountOfPreviousNotices;
+  noticeElement.style.zIndex = 50 + amountOfPreviousNotices;
 
   let logoElement = document.createElement("img");
   logoElement.id = "sponsorSkipLogo" + UUID;
@@ -471,11 +721,21 @@ function openSkipNotice(UUID){
   noticeElement.appendChild(voteButtonsContainer);
   noticeElement.appendChild(buttonContainer);
 
-  let referenceNode = document.getElementById("info");
+  let referenceNode = document.getElementById("movie_player");
   if (referenceNode == null) {
-    //old YouTube
-    referenceNode = document.getElementById("watch-header");
+    //for embeds
+    let player = document.getElementById("player");
+    referenceNode = player.firstChild;
+    let index = 1;
+
+    //find the child that is the video player (sometimes it is not the first)
+    while (!referenceNode.classList.contains("html5-video-player") || !referenceNode.classList.contains("ytp-embed")) {
+      referenceNode = player.children[index];
+
+      index++;
     }
+  }
+
   referenceNode.prepend(noticeElement);
 }
 
@@ -562,8 +822,13 @@ function vote(type, UUID) {
         //failure: duplicate vote
         addLoadingInfo("It seems you've already voted before", UUID)
       } else if (response.successType == -1) {
-        //failure: duplicate vote
-        addLoadingInfo("A connection error has occured.", UUID)
+        if (response.statusCode == 502) {
+          addLoadingInfo("It seems the sever is down. Contact the dev immediately.", UUID)
+        } else {
+          //failure: unknown error
+          addLoadingInfo("A connection error has occured. Error code: " + response.statusCode, UUID)
+        }
+        
       }
     }
   });
@@ -593,27 +858,47 @@ function dontShowNoticeAgain() {
   closeAllSkipNotices();
 }
 
-function sponsorMessageStarted() {
+function sponsorMessageStarted(callback) {
     let v = document.querySelector('video');
 
     //send back current time
-    chrome.runtime.sendMessage({
-      message: "time",
+    callback({
       time: v.currentTime
-    });
+    })
 
     //update button
     toggleStartSponsorButton();
 }
 
 function submitSponsorTimes() {
-  if(!confirm("Are you sure you want to submit this?")) return;
-
   if (document.getElementById("submitButton").style.display == "none") {
     //don't submit, not ready
     return;
   }
 
+  //it can't update to this info yet
+  closeInfoMenu();
+
+  let currentVideoID = getYouTubeVideoID(document.URL);
+
+  let sponsorTimeKey = 'sponsorTimes' + currentVideoID;
+  chrome.storage.sync.get([sponsorTimeKey], function(result) {
+    let sponsorTimes = result[sponsorTimeKey];
+
+    if (sponsorTimes != undefined && sponsorTimes.length > 0) {
+      let confirmMessage = "Are you sure you want to submit this?\n\n" + getSponsorTimesMessage(sponsorTimes);
+      confirmMessage += "\n\nTo edit or delete values, click the info button or open the extension popup by clicking the extension icon in the top right corner."
+      if(!confirm(confirmMessage)) return;
+
+      sendSubmitMessage();
+    }
+  });
+
+}
+
+//send the message to the background js
+//called after all the checks have been made that it's okay to do so
+function sendSubmitMessage(){
   //add loading animation
   document.getElementById("submitButtonImage").src = chrome.extension.getURL("icons/PlayerUploadIconSponsorBlocker256px.png");
   document.getElementById("submitButton").style.animation = "rotate 1s 0s infinite";
@@ -632,8 +917,7 @@ function submitSponsorTimes() {
         submitButton.style.animation = "rotate 1s";
         //when the animation is over, hide the button
         submitButton.addEventListener("animationend", function() {
-          submitButton.style.animation = "unset";
-          submitButton.style.display = "none";
+          changeStartSponsorButton(true, false);
         });
 
         //clear the sponsor times
@@ -644,11 +928,59 @@ function submitSponsorTimes() {
         //show that the upload failed
         document.getElementById("submitButton").style.animation = "unset";
         document.getElementById("submitButtonImage").src = chrome.extension.getURL("icons/PlayerUploadFailedIconSponsorBlocker256px.png");
+
+        if(response.statusCode == 400) {
+          alert("Server said this request was invalid");
+        } else if(response.statusCode == 429) {
+          alert("You have submitted too many sponsor times for this one video, are you sure there are this many?");
+        } else if(response.statusCode == 409) {
+          alert("This has already been submitted before");
+        } else if(response.statusCode == 502) {
+          alert("It seems the server is down. Contact the dev to inform them. Error code " + response.statusCode);
+        } else {
+          alert("There was an error submitting your sponsor times, please try again later. Error code " + response.statusCode);
+        }
       }
     }
   });
 }
 
+//get the message that visually displays the video times
+function getSponsorTimesMessage(sponsorTimes) {
+  let sponsorTimesMessage = "";
+
+  for (let i = 0; i < sponsorTimes.length; i++) {
+    for (let s = 0; s < sponsorTimes[i].length; s++) {
+      let timeMessage = getFormattedTime(sponsorTimes[i][s]);
+      //if this is an end time
+      if (s == 1) {
+        timeMessage = " to " + timeMessage;
+      } else if (i > 0) {
+        //add commas if necessary
+        timeMessage = ", " + timeMessage;
+      }
+
+      sponsorTimesMessage += timeMessage;
+    }
+  }
+
+  return sponsorTimesMessage;
+}
+
+//converts time in seconds to minutes:seconds
+function getFormattedTime(seconds) {
+  let minutes = Math.floor(seconds / 60);
+  let secondsDisplay = Math.round(seconds - minutes * 60);
+  if (secondsDisplay < 10) {
+    //add a zero
+    secondsDisplay = "0" + secondsDisplay;
+  }
+
+  let formatted = minutes+ ":" + secondsDisplay;
+
+  return formatted;
+}
+
 function sendRequestToServer(type, address, callback) {
   let xmlhttp = new XMLHttpRequest();
 
@@ -691,5 +1023,10 @@ function getYouTubeVideoID(url) { // Returns with video id else returns false
   var regExp = /^.*((youtu.be\/)|(v\/)|(\/u\/\w\/)|(embed\/)|(watch\?))\??v?=?([^#\&\?]*).*/;
   var match = url.match(regExp);
   var id = new URL(url).searchParams.get("v");
+  if (url.includes("/embed/")) {
+    //it is an embed, don't search for v
+    id = match[7];
+  }
+
   return (match && match[7].length == 11) ? id : false;
 }

firefox_manifest.json

@@ -10,11 +10,13 @@
       ],
       "js": [
         "config.js",
-        "content.js"
+        "content.js",
+        "popup.js"
       ],
       "css": [
         "content.css",
-        "./libs/Source+Sans+Pro.css"
+        "./libs/Source+Sans+Pro.css",
+        "popup.css"
       ]
     }
   ],
@@ -26,7 +28,12 @@
     "icons/PlayerUploadIconSponsorBlocker256px.png",
     "icons/PlayerUploadFailedIconSponsorBlocker256px.png",
     "icons/upvote.png",
-    "icons/downvote.png"
+    "icons/downvote.png",
+    "icons/PlayerInfoIconSponsorBlocker256px.png",
+    "icons/PlayerDeleteIconSponsorBlocker256px.png",
+    "popup.html",
+    "help/index.html",
+    "help/style.css"
   ],
   "permissions": [
     "tabs",

help/index.html

@@ -0,0 +1,122 @@
+<head>
+  <title> SponsorBlock </title>
+
+  <link href="styles.css" rel="stylesheet"/>
+</head>
+
+<body>
+
+  <div id="title">
+    <img src="https://github.com/ajayyy/SponsorBlock/raw/master/icons/LogoSponsorBlocker256px.png" height="80" class="profilepic"/>
+    SponsorBlock
+  </div>
+
+  <center>
+
+    <p class="createdBy">Created By <a href="https://ajay.app">Ajay Ramachandran</a></p>
+
+    <p>
+        Thanks for installing SponsorBlock. Here are some quick tips for getting started. Please join the Discord if you have any questions or suggestions.
+    </p>
+
+    <p class="projectPreview">
+      <span class="projectPreviewImage">
+          <a href="https://discord.gg/QnmVMpU"><img width="80" src="https://www.logolynx.com/images/logolynx/1b/1bcc0f0aefe71b2c8ce66ffe8645d365.png"/></a>
+      </span>
+	  
+	  Come contribute, make some suggestions and help out in the Discord: <a href="https://discord.gg/QnmVMpU">https://discord.gg/QnmVMpU</a>
+    </p>
+
+    <h1>How skipping works</h1>
+
+    <p class="projectPreview">
+      <span class="projectPreviewImageLarge">
+          <img src="https://i.imgur.com/caf5Bju.png">
+      </span>
+
+      Videos will automatically be skipped if they are found in the database. You can open the popup by clicking the extension icon to get a preview of what they are.
+      
+      <br/>
+      <br/>
+      Whenever you skip a video, you will get a notice allowing you to vote on that submission. If it worked, upvote it! You can also vote in the popup.
+    </p>
+
+    <center><img height="120px" src="https://i.imgur.com/1M0WZ99.gif"></center>
+
+    <h1>Submitting</h1>
+
+    <p class="projectPreview">
+        <span class="projectPreviewImageLargeRight">
+            <img src="https://i.imgur.com/A1ilk6x.gif">
+        </span>
+  
+        Submitting can either be done in the popup by hitting the "Sponsorship Starts Now" button or in the video player with the buttons on the player.
+        
+        <br/>
+        <br/>
+
+        Clicking the play button indicated the start of a sponsorship section and clicking the stop icon indicates the end. You can prepare multiple sponsors before hitting submit. Clicking the upload button will submit. Clicking the garbage can will delete.
+    </p>
+
+    <h1>Editing</h1>
+
+    <p class="projectPreview">
+        <span class="projectPreviewImageLarge">
+            <img src="https://i.imgur.com/DZHqbsx.gif">
+        </span>
+  
+        If you messed up, you can edit or delete your sponsor times in the popup or in the info menu (by hitting the info icon).
+
+    </p>
+
+    <h1>This is too slow</h1>
+
+    <p>
+      There are hotkeys if you want to use them. You must be focused on the YouTube player to use them. Press the semicolon key to indicate the start/end of a sponsor segment and click the appostrophe to submit.
+    </p>
+
+    <h1>I hate these buttons, they are so ugly</h1>
+
+    <p>
+      All player buttons can be hidden in the options.
+    </p>
+
+    <h1>Can I get a copy of the Database? What happens if you disappear?</h1>
+
+    <p>
+      The database is public and available at <a href="https://sponsor.ajay.app/database.db">https://sponsor.ajay.app/database.db</a>. The source code is freely available. So, even if something happens to me, your submissions are not lost.
+    </p>
+
+    <h1>News and how it is made</h1>
+
+    <p>
+      See <a href="https://sponsor.ajay.app/news">https://sponsor.ajay.app/news</a>.
+    </p>
+
+    <h1>I want more features!</h1>
+
+    <p>
+      Ask on Discord or make an Issue on GitHub. I am happy to hear suggestions or improvements you want. You may also contribute code or graphics if you would like.
+    </p>
+
+    <h1>Where can I get the source code</h1>
+
+    <h4 style="display: inline">Client:</h4>
+    <!-- Github logo -->
+    <a href="https://github.com/ajayyy/SponsorBlock"><svg aria-hidden="true" version="1.1" viewBox="0 0 16 16" height="58px" style="padding-left: 15px"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path></svg></a>
+
+    <h4 style="display: inline; padding-left: 20px">Server:</h4>
+    <!-- Github logo -->
+    <a href="https://github.com/ajayyy/SponsorBlockServer"><svg aria-hidden="true" version="1.1" viewBox="0 0 16 16" height="58px" style="padding-left: 15px"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path></svg></a>
+
+    <h1>Credit</h1>
+
+    <p>The awesome <a href="https://github.com/omarroth/invidious/wiki/API">Invidious API</a> is used to grab the time the video was published.</p>
+
+    <p>Some icons made by <a href="https://www.flaticon.com/authors/gregor-cresnar" title="Gregor Cresnar">Gregor Cresnar</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a> and are licensed by <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a></p>
+    
+    <p>Some icons made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a> and are licensed by <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a></p>
+
+  </center>
+
+</body>

help/styles.css

@@ -0,0 +1,176 @@
+:not(.hljs-keyword):not(.hljs-comment):not(.hljs-number):not(.hljs-string):not(pre):not(code) {
+  background-color: #333333;
+}
+
+.projectPreview {
+  position: relative;
+}
+
+.projectPreviewImage {
+  position: absolute;
+  left: -90;
+  width: 80;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.projectPreviewImageLarge {
+  position: absolute;
+  left: -210;
+  width: 200;
+  top: 50%;
+  transform: translateY(-20%);
+}
+
+.projectPreviewImageLargeRight {
+  position: absolute;
+  right: -210;
+  width: 200;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.createdBy {
+  font-size: 14px;
+  text-align: center;
+  padding-top: 0px;
+  padding-bottom: 0px;
+}
+
+#title {
+  background-color: #636363;
+
+  text-align: center;
+  vertical-align: middle;
+
+  font-family: sans-serif;
+  font-size: 50;
+  color: #212121;
+
+  /* height: 100; */
+
+  padding: 20;
+  
+  text-decoration: none;
+
+  transition: font-size 1s;
+}
+
+#title:hover {
+  font-size: 60;
+
+  transition: font-size 1s;
+}
+
+.subtitle {
+  font-family: sans-serif;
+  font-size: 40;
+  color: #dad8d8;
+
+  padding-top: 10;
+
+  transition: font-size 0.4s;
+}
+
+.subtitle:hover {
+  font-size: 45;
+
+  transition: font-size 0.4s;
+}
+
+.profilepic {
+  background-color: #636363 !important;
+  vertical-align: middle;
+}
+
+a {
+  text-decoration: underline;
+  color: inherit;
+}
+
+.link {
+  padding: 20;
+
+  height: 80px;
+
+  transition: height 0.2s;
+}
+
+.link:hover {
+  height: 95px;
+
+  transition: height 0.2s;
+}
+
+#contact,.smalllink {
+  font-family: sans-serif;
+  font-size: 25;
+  color: #e8e8e8;
+
+  text-align: center;
+  
+  padding: 10;
+}
+
+#contact {
+  text-decoration: none;
+}
+
+p,li {
+  font-family: sans-serif;
+  font-size: 20;
+  color: #c4c4c4;
+
+  padding: 10;
+}
+
+p,li,code,a {
+	max-width: 60%;
+	text-align: left;
+	overflow-wrap: break-word;
+}
+
+@media screen and (orientation:portrait) {
+  p,li,code,a {
+	max-width: 100%;
+  }
+  
+  .projectPreviewImage {
+    position: unset;
+    width: 130;
+    display: block;
+    margin: auto;
+    transform: none;
+  }
+}
+
+.previewImage {
+	max-height: 200px;
+}
+
+img {
+	max-width: 100%;
+
+	text-align: center;
+}
+
+#recentPostTitle {
+  font-family: sans-serif;
+  font-size: 30;
+  color: #dad8d8;
+}
+
+#recentPostDate {
+  font-family: sans-serif;
+  font-size: 15;
+  color: #dad8d8;
+}
+
+h1,h2,h3,h4,h5,h6 {
+  font-family: sans-serif;
+  color: #dad8d8;
+}
+
+svg {
+ text-decoration: none; 
+}

manifest.json

@@ -1,20 +1,23 @@
 {
-  "name": "SponsorBlock - YouTube Sponsorship Blocker",
+  "name": "SponsorBlock for YouTube - Skip Sponsorships",
   "short_name": "SponsorBlock",
-  "version": "1.0.14",
+  "version": "1.0.26",
   "description": "Skip over sponsorship on YouTube videos. Report sponsors on videos you watch to save the time of others.",
   "content_scripts": [
     {
       "matches": [
         "https://*.youtube.com/*"
       ],
+      "all_frames": true,
       "js": [
         "config.js",
-        "content.js"
+        "content.js",
+        "popup.js"
       ],
       "css": [
         "content.css",
-        "./libs/Source+Sans+Pro.css"
+        "./libs/Source+Sans+Pro.css",
+        "popup.css"
       ]
     }
   ],
@@ -26,7 +29,12 @@
     "icons/PlayerUploadIconSponsorBlocker256px.png",
     "icons/PlayerUploadFailedIconSponsorBlocker256px.png",
     "icons/upvote.png",
-    "icons/downvote.png"
+    "icons/downvote.png",
+    "icons/PlayerInfoIconSponsorBlocker256px.png",
+    "icons/PlayerDeleteIconSponsorBlocker256px.png",
+    "popup.html",
+    "help/index.html",
+    "help/style.css"
   ],
   "permissions": [
     "tabs",

popup.css

@@ -1,41 +1,92 @@
-* {
-  font-family: 'Source Sans Pro', sans-serif;
+/* reset some properties to default (youtube messes with them */
+p.popupElement {
+	margin-block-start: 1em;
+	margin-block-end: 1em;
+	margin-inline-start: 0px;
+	margin-inline-end: 0px;
 }
 
-h1 {
+h1.popupElement {
+	margin-block-start: 0.67em;
+    margin-block-end: 0.67em;
+    margin-inline-start: 0px;
+	margin-inline-end: 0px;
+	font-weight: bold;
+}
+
+h2.popupElement {
+	margin-block-start: 0.83em;
+    margin-block-end: 0.83em;
+    margin-inline-start: 0px;
+	margin-inline-end: 0px;
+	font-weight: bold;
+}
+
+h3.popupElement {
+	margin-block-start: 1em;
+    margin-block-end: 1em;
+    margin-inline-start: 0px;
+	margin-inline-end: 0px;
+	font-weight: bold;
+}
+
+sub.popupElement {
+	font-size: smaller;
+}
+/* end reset */
+
+.popupElement {
+  font-family: 'Source Sans Pro', sans-serif;
+
+  color: black;
+}
+
+h1.popupElement {
 	margin-top: 0px;
 }
 
-body {
+.popupBody {
 	font-size: 14px;
-  width: 300px;
 	background-color: #ffd9d9;
+	padding: 5px;
 }
 
-.recordingSubtitle {
+.recordingSubtitle.popupElement {
 	margin-bottom: 10px;
 }
 
-.voteButton {
+.voteButton.popupElement {
 	height: 32px;
 	margin-right: 15px;
 	cursor: pointer;
 }
-.voteButton:hover {
+.voteButton:hover.popupElement {
 	filter: brightness(80%);
 }
 
-#discordButtonContainer {
+#discordButtonContainer.popupElement {
 	font-size: 12px;
 }
 
-.smallLink {
+.sponsorTime.popupElement {
+	font-size: 20px;
+}
+
+.smallLink.popupElement {
 	font-size: 10px;
 	text-decoration: underline;
 	cursor: pointer;
 }
 
-.greenButton {
+.mediumLink.popupElement {
+	font-size: 15px;
+	padding-left: 15px;
+	padding-right: 15px;
+	text-decoration: underline;
+	cursor: pointer;
+}
+
+.greenButton.popupElement {
   background-color:#ec1c1c;
   -moz-border-radius:28px;
   -webkit-border-radius:28px;
@@ -49,19 +100,19 @@ body {
   text-decoration:none;
   text-shadow:0px 0px 0px #662727;
 }
-.greenButton:hover {
+.greenButton:hover.popupElement {
   background-color:#bf2a2a;
 }
-.greenButton:focus {
+.greenButton:focus.popupElement {
 	outline: none;
 	background-color:#bf2a2a;
 }
-.greenButton:active {
+.greenButton:active.popupElement {
   position:relative;
   top:1px;
 }
 
-.dangerButton {
+.dangerButton.popupElement {
 	-moz-box-shadow:inset 0px 1px 0px 0px #cf866c;
 	-webkit-box-shadow:inset 0px 1px 0px 0px #cf866c;
 	box-shadow:inset 0px 1px 0px 0px #cf866c;
@@ -78,19 +129,19 @@ body {
 	text-decoration:none;
 	text-shadow:0px 1px 0px #854629;
 }
-.dangerButton:hover {
+.dangerButton:hover.popupElement {
 	background-color:#bc3315;
 }
-.dangerButton:focus {
+.dangerButton:focus.popupElement {
 	outline: none;
 	background-color:#bc3315;
 }
-.dangerButton:active {
+.dangerButton:active.popupElement {
 	position:relative;
 	top:1px;
 }
 
-.warningButton {
+.warningButton.popupElement {
 	-moz-box-shadow:inset 0px 1px 0px 0px #cfbd6c;
 	-webkit-box-shadow:inset 0px 1px 0px 0px #cfbd6c;
 	box-shadow:inset 0px 1px 0px 0px #cfbd6c;
@@ -107,19 +158,19 @@ body {
 	text-decoration:none;
 	text-shadow:0px 1px 0px #856829;
 }
-.warningButton:hover {
+.warningButton:hover.popupElement {
 	background-color:#bc8215;
 }
-.warningButton:focus {
+.warningButton:focus.popupElement {
 	outline: none;
 	background-color:#bc8215;
 }
-.warningButton:active {
+.warningButton:active.popupElement {
 	position:relative;
 	top:1px;
 }
 
-.smallButton {
+.smallButton.popupElement {
 	background-color:#f9902d;
 	-moz-border-radius:3px;
 	-webkit-border-radius:3px;
@@ -132,14 +183,14 @@ body {
 	padding:6px 10px;
 	text-decoration:none;
 }
-.smallButton:hover {
+.smallButton:hover.popupElement {
 	background-color:#fa9806;
 }
-.smallButton:focus {
+.smallButton:focus.popupElement {
 	outline: none;
 	background-color:#fa9806;
 }
-.smallButton:active {
+.smallButton:active.popupElement {
 	position:relative;
 	top:1px;
 }

popup.html

@@ -1,97 +1,98 @@
 <html>
   <head>
     <title>Set Page Color Popup</title>
-    <link rel="stylesheet" type="text/css" href="/libs/Source+Sans+Pro.css"/>
-    <link rel="stylesheet" type="text/css" href="popup.css"/>
+    <link id="sponorBlockPopupFont" rel="stylesheet" type="text/css" href="/libs/Source+Sans+Pro.css"/>
+    <link id="sponorBlockStyleSheet" rel="stylesheet" type="text/css" href="popup.css"/>
   </head>
 
+  <body class="popupBody">
     <center>
-    <div id="app">
-        <img src="icons/LogoSponsorBlocker256px.png" height="64px"/>
+      <div id="app" class="popupBody">
+          <img src="icons/LogoSponsorBlocker256px.png" height="64px" id="sponsorBlockPopupLogo"/>
 
-        <h1>SponsorBlock</h1>
+          <h1 class="popupElement">SponsorBlock</h1>
 
           <!-- Loading text -->
-        <p id="loadingIndicator">Loading...</p>
+          <p id="loadingIndicator" class="popupElement">Loading...</p>
 
           <!-- Hidden until loading complete -->
-        <div id="mainControls" class="main" style="display: none">
+          <div id="mainControls" class="main popupElement" style="display: none">
             <!-- If the video was found in the database -->
             <div id="videoFound">
                 
             </div>
 
-          <div id="downloadedSponsorMessageTimes">
+            <div id="downloadedSponsorMessageTimes" class="popupElement">
 
             </div>
 
             <br/>
 
-          <button id="reportAnIssue" class="dangerButton">Vote On A Sponsor Time</button>
+            <button id="reportAnIssue" class="dangerButton popupElement">Vote On A Sponsor Time</button>
 
-          <div id="issueReporterContainer" style="display: none">
+            <div id="issueReporterContainer"  class="popupElement" style="display: none">
 
-            <h3 style="margin-top: 0px">Vote On A Sponsor Time</h3>
+              <h3 style="margin-top: 0px" class="popupElement">Vote On A Sponsor Time</h3>
 
-            <div id="issueReporterTimeButtons">
+              <div id="issueReporterTimeButtons" class="popupElement">
 
               </div>
 
             </div>
 
-          <h2 class="recordingSubtitle">Record the times of a sponsorship</h2>
+            <h2 class="recordingSubtitle popupElement">Record the times of a sponsorship</h2>
 
-          <p>
-            <span id=sponsorTimesContributionsContainer style="display: none">
+            <p class="popupElement">
+              <span id=sponsorTimesContributionsContainer  class="popupElement" style="display: none">
                   So far, you've submitted
-                <span id="sponsorTimesContributionsDisplay">
+                  <span id="sponsorTimesContributionsDisplay" class="popupElement">
                     0
                   </span>
-                <span id="sponsorTimesContributionsDisplayEndWord">
+                  <span id="sponsorTimesContributionsDisplayEndWord" class="popupElement">
                     sponsors.
                   </span>
               </span>
 
-            <span id=sponsorTimesViewsContainer style="display: none">
+              <span id=sponsorTimesViewsContainer  class="popupElement" style="display: none">
                   You have saved people from 
-                <span id="sponsorTimesViewsDisplay">
+                  <span id="sponsorTimesViewsDisplay" class="popupElement">
                     0
                   </span>
-                <span id="sponsorTimesViewsDisplayEndWord">
+                  <span id="sponsorTimesViewsDisplayEndWord" class="popupElement">
                     sponsor segments.
                   </span>
               </span>
             </p>
 
-          <p> 
+            <p class="popupElement"> 
               Click the button below when the sponsorship starts and ends to record and 
               submit it to the database.
             </p>
     
             <div>
-            <button id="sponsorStart" class="greenButton">Sponsorship Starts Now</button>
+              <button id="sponsorStart" class="greenButton popupElement">Sponsorship Starts Now</button>
             </div>
 
-          <sub>Hint: Press the semicolon key while focused on a video report the start/end of a sponsor and quote to submit.</sub>
+            <sub class="popupElement">Hint: Press the semicolon key while focused on a video report the start/end of a sponsor and quote to submit.</sub>
     
-          <div id="submissionSection" style="display: none">
-            <h3>Latest Sponsor Message Times Chosen</h3>
+            <div id="submissionSection"  class="popupElement" style="display: none">
+              <h3 class="popupElement">Latest Sponsor Message Times Chosen</h3>
               <b>
-              <div id="sponsorMessageTimes">
+                <div id="sponsorMessageTimes" class="popupElement">
         
                 </div>
               </b>
       
-            <button id="clearTimes" class="smallButton">Clear Times</button>
+              <button id="clearTimes" class="smallButton popupElement">Clear Times</button>
       
               <br/>
               <br/>
 
-            <div id="submitTimesContainer" style="display: none">
-              <button id="submitTimes" class="smallButton">Submit Times</button>
+              <div id="submitTimesContainer" class="popupElement" style="display: none">
+                <button id="submitTimes" class="smallButton popupElement">Submit Times</button>
 
-              <div id="submitTimesInfoMessageContainer" style="display: none">
-                <h3 id="submitTimesInfoMessage">
+                <div id="submitTimesInfoMessageContainer" class="popupElement" style="display: none">
+                  <h3 id="submitTimesInfoMessage" class="popupElement">
 
                   </h3>
                 </div>
@@ -100,10 +101,10 @@
       
             </div>
 
-          <div id="discordButtonContainer" style="display: none">
+            <div id="discordButtonContainer" class="popupElement" style="display: none">
               <br/>
 
-            <a href="https://discord.gg/QnmVMpU" target="_blank"><img src="https://www.logolynx.com/images/logolynx/1b/1bcc0f0aefe71b2c8ce66ffe8645d365.png" height="32px"/></a>
+              <a href="https://discord.gg/QnmVMpU" class="popupElement" target="_blank"><img src="https://www.logolynx.com/images/logolynx/1b/1bcc0f0aefe71b2c8ce66ffe8645d365.png" height="32px"/></a>
 
               <br/>
 
@@ -111,26 +112,26 @@
 
               <br/>
 
-            <span id="hideDiscordButton" class="smallLink">Hide this</span>
+              <span id="hideDiscordButton" class="smallLink popupElement">Hide this</span>
             </div>
 
-          <div id="optionsButtonContainer">
+            <div id="optionsButtonContainer" class="popupElement">
                 <br/>
                 <br/>
       
-              <button id="optionsButton" class="dangerButton">Options</button>
+                <button id="optionsButton" class="dangerButton popupElement">Options</button>
             </div>
 
-          <div id="options" style="display: none">
+            <div id="options" class="popupElement" style="display: none">
                 <br/>
 
                 <h3>Options</h3>
       
-              <button id="hideVideoPlayerControls" class="warningButton">Hide Button On YouTube Player</button>
-              <button id="showVideoPlayerControls" style="display: none" class="warningButton">Show Button On YouTube Player</button>
+                <button id="hideVideoPlayerControls" class="warningButton popupElement">Hide Buttons On YouTube Player</button>
+                <button id="showVideoPlayerControls" style="display: none" class="warningButton popupElement">Show Buttons On YouTube Player</button>
                 <br/>
-              <sub>
-                This hides the button that appears on the YouTube player to submit sponsors. I can see this being annoying for some 
+                <sub class="popupElement">
+                  This hides the buttons that appear on the YouTube player to submit sponsors. I can see this being annoying for some 
                   people. Instead of using the button there, this popup can be used to submit sponsors. To hide the notice that appears, 
                   use the button that appears on the notice saying "Don't show this again". You can always enable these settings again 
                   later.
@@ -139,10 +140,30 @@
                 <br/>
                 <br/>
 
-              <button id="disableSponsorViewTracking" class="warningButton">Disable Sponsor View Tracking</button>
-              <button id="enableSponsorViewTracking" style="display: none" class="warningButton">Enable Sponsor View Tracking</button>
+                <button id="hideInfoButtonPlayerControls" class="warningButton popupElement">Hide Info Button On YouTube Player</button>
+                <button id="showInfoButtonPlayerControls" style="display: none" class="warningButton popupElement">Show Info Button On YouTube Player</button>
                 <br/>
-              <sub>
+                <sub class="popupElement">
+                  This is the button that opens up a popup in the YouTube page.
+                </sub>
+
+                <br/>
+                <br/>
+
+                <button id="hideDeleteButtonPlayerControls" class="warningButton popupElement">Hide Delete Button On YouTube Player</button>
+                <button id="showDeleteButtonPlayerControls" style="display: none" class="warningButton popupElement">Show Delete Button On YouTube Player</button>
+                <br/>
+                <sub class="popupElement">
+                  This is the button that allows you to clear all sponsors on the YouTube player.
+                </sub>
+
+                <br/>
+                <br/>
+
+                <button id="disableSponsorViewTracking" class="warningButton popupElement">Disable Sponsor View Tracking</button>
+                <button id="enableSponsorViewTracking" style="display: none" class="warningButton popupElement">Enable Sponsor View Tracking</button>
+                <br/>
+                <sub class="popupElement">
                   This feature tracks which sponsors you have skipped to let users know how much their submission has helped others and
                   used as a metric along with upvotes to ensure that spam doesn't get into the database. The extension sends a message
                   to the server each time you skip a sponsor. Hopefully most people don't change this setting so that the view numbers
@@ -152,11 +173,12 @@
                 <br/>
                 <br/>
 
-              <button id="showNoticeAgain" style="display: none" class="dangerButton">Show Notice Again</button>
+                <button id="showNoticeAgain" style="display: none" class="dangerButton popupElement">Show Notice Again</button>
             </div>
           </div>
         </div>
     </center>
+  </body>
 
   <!-- Scripts that need to load after the html -->
   <script src="config.js"></script>

popup.js

@@ -1,28 +1,65 @@
 
-// References
+//make this a function to allow this to run on the content page
+function runThePopup() {
+
+  //is it in the popup or content script
+  var inPopup = true;
+  if (chrome.tabs == undefined) {
+      //this is on the content script, use direct communication
+      chrome.tabs = {};
+      chrome.tabs.sendMessage = function(id, request, callback) {
+          messageListener(request, null, callback);
+      }
+  
+      //add a dummy query method
+      chrome.tabs.query = function(config, callback) {
+          callback([{
+              url: document.URL,
+              id: -1
+          }]);
+      }
+  
+      inPopup = false;
+  }
+  
   var SB = {};
 
-SB.sponsorStart = document.getElementById("sponsorStart");
-SB.clearTimes = document.getElementById("clearTimes");
-SB.submitTimes = document.getElementById("submitTimes");
-SB.showNoticeAgain = document.getElementById("showNoticeAgain");
-SB.hideVideoPlayerControls = document.getElementById("hideVideoPlayerControls");
-SB.showVideoPlayerControls = document.getElementById("showVideoPlayerControls");
-SB.disableSponsorViewTracking = document.getElementById("disableSponsorViewTracking");
-SB.enableSponsorViewTracking = document.getElementById("enableSponsorViewTracking");
-SB.optionsButton = document.getElementById("optionsButton");
-SB.reportAnIssue = document.getElementById("reportAnIssue");
+  ["sponsorStart",
+  "clearTimes",
+  "submitTimes",
+  "showNoticeAgain",
+  "hideVideoPlayerControls",
+  "showVideoPlayerControls",
+  "hideInfoButtonPlayerControls",
+  "showInfoButtonPlayerControls",
+  "hideDeleteButtonPlayerControls",
+  "showDeleteButtonPlayerControls",
+  "disableSponsorViewTracking",
+  "enableSponsorViewTracking",
+  "optionsButton",
+  "reportAnIssue",
   // sponsorTimesContributions
-SB.sponsorTimesContributionsContainer = document.getElementById("sponsorTimesContributionsContainer");
-SB.sponsorTimesContributionsDisplay = document.getElementById("sponsorTimesContributionsDisplay");
-SB.sponsorTimesContributionsDisplayEndWord = document.getElementById("sponsorTimesContributionsDisplayEndWord");
+  "sponsorTimesContributionsContainer",
+  "sponsorTimesContributionsDisplay",
+  "sponsorTimesContributionsDisplayEndWord",
   // sponsorTimesViewsDisplay
-SB.sponsorTimesViewsContainer = document.getElementById("sponsorTimesViewsDisplayContainer");
-SB.sponsorTimesViewsDisplay = document.getElementById("sponsorTimesViewsDisplayDisplay");
-SB.sponsorTimesViewsDisplayEndWord = document.getElementById("sponsorTimesViewsDisplayDisplayEndWord");
+  "sponsorTimesViewsContainer",
+  "sponsorTimesViewsDisplay",
+  "sponsorTimesViewsDisplayEndWord",
   // discordButtons
-SB.discordButtonContainer = document.getElementById("discordButtonContainer");
-SB.hideDiscordButton = document.getElementById("hideDiscordButton");
+  "discordButtonContainer",
+  "hideDiscordButton",
+  // submitTimesInfoMessage
+  "submitTimesInfoMessageContainer",
+  "submitTimesInfoMessage",
+  // More
+  "submissionSection",
+  "mainControls",
+  "loadingIndicator",
+  "videoFound",
+  "sponsorMessageTimes",
+  "downloadedSponsorMessageTimes",
+  ].forEach(id => SB[id] = document.getElementById(id));
 
   //setup click listeners
   SB.sponsorStart.addEventListener("click", sendSponsorStartMessage);
@@ -31,24 +68,36 @@ SB.submitTimes.addEventListener("click", submitTimes);
   SB.showNoticeAgain.addEventListener("click", showNoticeAgain);
   SB.hideVideoPlayerControls.addEventListener("click", hideVideoPlayerControls);
   SB.showVideoPlayerControls.addEventListener("click", showVideoPlayerControls);
+  SB.hideInfoButtonPlayerControls.addEventListener("click", hideInfoButtonPlayerControls);
+  SB.showInfoButtonPlayerControls.addEventListener("click", showInfoButtonPlayerControls);
+  SB.hideDeleteButtonPlayerControls.addEventListener("click", hideDeleteButtonPlayerControls);
+  SB.showDeleteButtonPlayerControls.addEventListener("click", showDeleteButtonPlayerControls);
   SB.disableSponsorViewTracking.addEventListener("click", disableSponsorViewTracking);
   SB.enableSponsorViewTracking.addEventListener("click", enableSponsorViewTracking);
   SB.optionsButton.addEventListener("click", openOptions);
   SB.reportAnIssue.addEventListener("click", reportAnIssue);
   SB.hideDiscordButton.addEventListener("click", hideDiscordButton);
   
+  //setup error message languages
+  var EN_US = new Map();
+
+  EN_US.set(400, 'Server said this request was invalid"')
+     .set(429, 'You have submitted too many sponsor times for this one video, are you sure there are this many?')
+     .set(409, 'This has already been submitted before')
+     .set(502, 'It seems the server is down. Contact the dev to inform them.')
+     .set('Unknown', 'There was an error submitting your sponsor times, please try again later.');
 
   //if true, the button now selects the end time
-var startTimeChosen = false;
+  let startTimeChosen = false;
   
   //the start and end time pairs (2d)
-var sponsorTimes = [];
+  let sponsorTimes = [];
   
   //current video ID of this tab
-var currentVideoID = null;
+  let currentVideoID = null;
   
   //is this a YouTube tab?
-var isYouTubeTab = false;
+  let isYouTubeTab = false;
   
   //see if discord link can be shown
   chrome.storage.sync.get(["hideDiscordLink"], function(result) {
@@ -70,7 +119,7 @@ chrome.storage.sync.get(["hideDiscordLink"], function(result) {
     }
   });
   
-//if the don't show notice again variable is true, an option to 
+  //if the don't show notice again letiable is true, an option to 
   //  disable should be available
   chrome.storage.sync.get(["dontShowNoticeAgain"], function(result) {
     let dontShowNoticeAgain = result.dontShowNoticeAgain;
@@ -79,7 +128,7 @@ chrome.storage.sync.get(["dontShowNoticeAgain"], function(result) {
     }
   });
   
-//show proper video player controls option
+  //show proper video player controls options
   chrome.storage.sync.get(["hideVideoPlayerControls"], function(result) {
     let hideVideoPlayerControls = result.hideVideoPlayerControls;
     if (hideVideoPlayerControls != undefined && hideVideoPlayerControls) {
@@ -87,6 +136,20 @@ chrome.storage.sync.get(["hideVideoPlayerControls"], function(result) {
       SB.showVideoPlayerControls.style.display = "unset";
     }
   });
+  chrome.storage.sync.get(["hideInfoButtonPlayerControls"], function(result) {
+    let hideInfoButtonPlayerControls = result.hideInfoButtonPlayerControls;
+    if (hideInfoButtonPlayerControls != undefined && hideInfoButtonPlayerControls) {
+      SB.hideInfoButtonPlayerControls.style.display = "none";
+      SB.showInfoButtonPlayerControls.style.display = "unset";
+    }
+  });
+  chrome.storage.sync.get(["hideDeleteButtonPlayerControls"], function(result) {
+    let hideDeleteButtonPlayerControls = result.hideDeleteButtonPlayerControls;
+    if (hideDeleteButtonPlayerControls != undefined && hideDeleteButtonPlayerControls) {
+      SB.hideDeleteButtonPlayerControls.style.display = "none";
+      SB.showDeleteButtonPlayerControls.style.display = "unset";
+    }
+  });
   
   //show proper tracking option
   chrome.storage.sync.get(["trackViewCount"], function(result) {
@@ -123,6 +186,7 @@ chrome.storage.sync.get(["sponsorTimesContributed"], function(result) {
                 } else {
                   SB.sponsorTimesViewsDisplayEndWord.innerText = "sponsor segment."
                 }
+
                 SB.sponsorTimesViewsDisplay.innerText = viewCount;
                 SB.sponsorTimesViewsContainer.style.display = "unset";
               }
@@ -139,6 +203,7 @@ chrome.tabs.query({
       currentWindow: true
   }, loadTabData);
   
+  
   function loadTabData(tabs) {
     //set current videoID
     currentVideoID = getYouTubeVideoID(tabs[0].url);
@@ -164,7 +229,7 @@ function loadTabData(tabs) {
         displaySponsorTimes();
   
         //show submission section
-      document.getElementById("submissionSection").style.display = "unset";
+        SB.submissionSection.style.display = "unset";
   
         showSubmitTimesIfNecessary();
       }
@@ -188,19 +253,19 @@ function infoFound(request) {
     //if request is undefined, then the page currently being browsed is not YouTube
     if (request != undefined) {
       //this must be a YouTube video
-    //set variable
+      //set letiable
       isYouTubeTab = true;
   
       //remove loading text
-    document.getElementById("mainControls").style.display = "unset"
-    document.getElementById("loadingIndicator").innerHTML = "";
+      SB.mainControls.style.display = "unset"
+      SB.loadingIndicator.innerHTML = "";
 
       if (request.found) {
-      document.getElementById("videoFound").innerHTML = "This video's sponsors are in the database!"
+        SB.videoFound.innerHTML = "This video's sponsors are in the database!"
 
         displayDownloadedSponsorTimes(request);
       } else {
-      document.getElementById("videoFound").innerHTML = "No sponsors found"
+        SB.videoFound.innerHTML = "No sponsors found"
       }
     }
   }
@@ -220,23 +285,37 @@ function sendSponsorStartMessage() {
       }, tabs => {
         chrome.tabs.sendMessage(
           tabs[0].id,
-        {from: 'popup', message: 'sponsorStart'}
+          {from: 'popup', message: 'sponsorStart'},
+          startSponsorCallback
         );
       });
   }
   
-chrome.runtime.onMessage.addListener(function (request, sender, callback) {
-  if (request.message == "time") {
+  function startSponsorCallback(response) {
     let sponsorTimesIndex = sponsorTimes.length - (startTimeChosen ? 1 : 0);
   
     if (sponsorTimes[sponsorTimesIndex] == undefined) {
       sponsorTimes[sponsorTimesIndex] = [];
     }
   
-    sponsorTimes[sponsorTimesIndex][startTimeChosen ? 1 : 0] = request.time;
+    sponsorTimes[sponsorTimesIndex][startTimeChosen ? 1 : 0] = response.time;
   
     let sponsorTimeKey = "sponsorTimes" + currentVideoID;
-    chrome.storage.sync.set({[sponsorTimeKey]: sponsorTimes});
+    let localStartTimeChosen = startTimeChosen;
+    chrome.storage.sync.set({[sponsorTimeKey]: sponsorTimes}, function() {
+      //send a message to the client script
+      if (localStartTimeChosen) {
+        chrome.tabs.query({
+          active: true,
+          currentWindow: true
+        }, tabs => {
+          chrome.tabs.sendMessage(
+            tabs[0].id,
+            {message: "sponsorDataChanged"}
+          );
+        });
+      }
+    });
   
     updateStartTimeChosen();
   
@@ -244,29 +323,33 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
     displaySponsorTimes();
   
     //show submission section
-    document.getElementById("submissionSection").style.display = "unset";
+    SB.submissionSection.style.display = "unset";
   
     showSubmitTimesIfNecessary();
   }
-});
   
   //display the video times from the array
   function displaySponsorTimes() {
-  //set it to the message
-  document.getElementById("sponsorMessageTimes").innerHTML = getSponsorTimesMessage(sponsorTimes);
+    //remove all children
+    while (SB.sponsorMessageTimes.firstChild) {
+      SB.sponsorMessageTimes.removeChild(SB.sponsorMessageTimes.firstChild);
+    }
+
+    //add sponsor times
+    SB.sponsorMessageTimes.appendChild(getSponsorTimesMessageDiv(sponsorTimes));
   }
   
   //display the video times from the array at the top, in a different section
   function displayDownloadedSponsorTimes(request) {
     if (request.sponsorTimes != undefined) {
       //set it to the message
-    document.getElementById("downloadedSponsorMessageTimes").innerHTML = getSponsorTimesMessage(request.sponsorTimes);
+      SB.downloadedSponsorMessageTimes.innerText = getSponsorTimesMessage(request.sponsorTimes);
 
       //add them as buttons to the issue reporting container
       let container = document.getElementById("issueReporterTimeButtons");
       for (let i = 0; i < request.sponsorTimes.length; i++) {
         let sponsorTimeButton = document.createElement("button");
-      sponsorTimeButton.className = "warningButton";
+        sponsorTimeButton.className = "warningButton popupElement";
         sponsorTimeButton.innerText = getFormattedTime(request.sponsorTimes[i][0]) + " to " + getFormattedTime(request.sponsorTimes[i][1]);
         
         let votingButtons = document.createElement("div");
@@ -281,13 +364,13 @@ function displayDownloadedSponsorTimes(request) {
   
         let upvoteButton = document.createElement("img");
         upvoteButton.id = "sponsorTimesUpvoteButtonsContainer" + UUID;
-      upvoteButton.className = "voteButton";
+        upvoteButton.className = "voteButton popupElement";
         upvoteButton.src = chrome.extension.getURL("icons/upvote.png");
         upvoteButton.addEventListener("click", () => vote(1, UUID));
   
         let downvoteButton = document.createElement("img");
         downvoteButton.id = "sponsorTimesDownvoteButtonsContainer" + UUID;
-      downvoteButton.className = "voteButton";
+        downvoteButton.className = "voteButton popupElement";
         downvoteButton.src = chrome.extension.getURL("icons/downvote.png");
         downvoteButton.addEventListener("click", () => vote(0, UUID));
   
@@ -336,6 +419,220 @@ function getSponsorTimesMessage(sponsorTimes) {
     return sponsorTimesMessage;
   }
   
+  //get the message that visually displays the video times
+  //this version is a div that contains each with delete buttons
+  function getSponsorTimesMessageDiv(sponsorTimes) {
+    // let sponsorTimesMessage = "";
+    let sponsorTimesContainer = document.createElement("div");
+    sponsorTimesContainer.id = "sponsorTimesContainer";
+  
+    for (let i = 0; i < sponsorTimes.length; i++) {
+      let currentSponsorTimeContainer = document.createElement("div");
+      currentSponsorTimeContainer.id = "sponsorTimeContainer" + i;
+      currentSponsorTimeContainer.className = "sponsorTime popupElement";
+      let currentSponsorTimeMessage = "";
+  
+      let deleteButton = document.createElement("span");
+      deleteButton.id = "sponsorTimeDeleteButton" + i;
+      deleteButton.innerText = "Delete";
+      deleteButton.className = "mediumLink popupElement";
+      let index = i;
+      deleteButton.addEventListener("click", () => deleteSponsorTime(index));
+  
+      let spacer = document.createElement("span");
+      spacer.innerText = " ";
+  
+      let editButton = document.createElement("span");
+      editButton.id = "sponsorTimeEditButton" + i;
+      editButton.innerText = "Edit";
+      editButton.className = "mediumLink popupElement";
+      editButton.addEventListener("click", () => editSponsorTime(index));
+  
+      for (let s = 0; s < sponsorTimes[i].length; s++) {
+        let timeMessage = getFormattedTime(sponsorTimes[i][s]);
+        //if this is an end time
+        if (s == 1) {
+          timeMessage = " to " + timeMessage;
+        } else if (i > 0) {
+          //add commas if necessary
+          timeMessage = timeMessage;
+        }
+  
+        currentSponsorTimeMessage += timeMessage;
+      }
+  
+      currentSponsorTimeContainer.innerText = currentSponsorTimeMessage;
+      currentSponsorTimeContainer.addEventListener("click", () => editSponsorTime(index));
+  
+      sponsorTimesContainer.appendChild(currentSponsorTimeContainer);
+      sponsorTimesContainer.appendChild(deleteButton);
+  
+      //only if it is a complete sponsor time
+      if (sponsorTimes[i].length > 1) {
+        sponsorTimesContainer.appendChild(editButton);
+      }
+    }
+  
+    return sponsorTimesContainer;
+  }
+  
+  function editSponsorTime(index) {
+    if (document.getElementById("startTimeMinutes" + index) != null) {
+      //already open
+      return;
+    }
+
+    //hide submit button
+    document.getElementById("submitTimesContainer").style.display = "none";
+  
+    let sponsorTimeContainer = document.getElementById("sponsorTimeContainer" + index);
+  
+    //get sponsor time minutes and seconds boxes
+    let startTimeMinutes = document.createElement("input");
+    startTimeMinutes.id = "startTimeMinutes" + index;
+    startTimeMinutes.className = "sponsorTime popupElement";
+    startTimeMinutes.type = "text";
+    startTimeMinutes.value = getTimeInMinutes(sponsorTimes[index][0]);
+    startTimeMinutes.style.width = "45px";
+    
+    let startTimeSeconds = document.createElement("input");
+    startTimeSeconds.id = "startTimeSeconds" + index;
+    startTimeSeconds.className = "sponsorTime popupElement";
+    startTimeSeconds.type = "text";
+    startTimeSeconds.value = getTimeInFormattedSeconds(sponsorTimes[index][0]);
+    startTimeSeconds.style.width = "60px";
+  
+    let endTimeMinutes = document.createElement("input");
+    endTimeMinutes.id = "endTimeMinutes" + index;
+    endTimeMinutes.className = "sponsorTime popupElement";
+    endTimeMinutes.type = "text";
+    endTimeMinutes.value = getTimeInMinutes(sponsorTimes[index][1]);
+    endTimeMinutes.style.width = "45px";
+    
+    let endTimeSeconds = document.createElement("input");
+    endTimeSeconds.id = "endTimeSeconds" + index;
+    endTimeSeconds.className = "sponsorTime popupElement";
+    endTimeSeconds.type = "text";
+    endTimeSeconds.value = getTimeInFormattedSeconds(sponsorTimes[index][1]);
+    endTimeSeconds.style.width = "60px";
+  
+    let colonText = document.createElement("span");
+    colonText.innerText = ":";
+  
+    let toText = document.createElement("span");
+    toText.innerText = " to ";
+  
+    //remove all children to replace
+    while (sponsorTimeContainer.firstChild) {
+      sponsorTimeContainer.removeChild(sponsorTimeContainer.firstChild);
+    }
+  
+    sponsorTimeContainer.appendChild(startTimeMinutes);
+    sponsorTimeContainer.appendChild(colonText);
+    sponsorTimeContainer.appendChild(startTimeSeconds);
+    sponsorTimeContainer.appendChild(toText);
+    sponsorTimeContainer.appendChild(endTimeMinutes);
+    sponsorTimeContainer.appendChild(colonText);
+    sponsorTimeContainer.appendChild(endTimeSeconds);
+  
+    //add save button and remove edit button
+    let saveButton = document.createElement("span");
+    saveButton.id = "sponsorTimeSaveButton" + index;
+    saveButton.innerText = "Save";
+    saveButton.className = "mediumLink popupElement";
+    saveButton.addEventListener("click", () => saveSponsorTimeEdit(index));
+  
+    let editButton = document.getElementById("sponsorTimeEditButton" + index);
+    let sponsorTimesContainer = document.getElementById("sponsorTimesContainer");
+  
+    sponsorTimesContainer.replaceChild(saveButton, editButton);
+  }
+  
+  function saveSponsorTimeEdit(index) {
+    let startTimeMinutes = document.getElementById("startTimeMinutes" + index);
+    let startTimeSeconds = document.getElementById("startTimeSeconds" + index);
+  
+    let endTimeMinutes = document.getElementById("endTimeMinutes" + index);
+    let endTimeSeconds = document.getElementById("endTimeSeconds" + index);
+  
+    sponsorTimes[index][0] = parseInt(startTimeMinutes.value) * 60 + parseFloat(startTimeSeconds.value);
+    sponsorTimes[index][1] = parseInt(endTimeMinutes.value) * 60 + parseFloat(endTimeSeconds.value);
+  
+    //save this
+    let sponsorTimeKey = "sponsorTimes" + currentVideoID;
+    chrome.storage.sync.set({[sponsorTimeKey]: sponsorTimes}, function() {
+      chrome.tabs.query({
+        active: true,
+        currentWindow: true
+      }, tabs => {
+        chrome.tabs.sendMessage(
+          tabs[0].id,
+          {message: "sponsorDataChanged"}
+        );
+      });
+    });
+  
+    displaySponsorTimes();
+
+    showSubmitTimesIfNecessary();
+  }
+  
+  //deletes the sponsor time submitted at an index
+  function deleteSponsorTime(index) {
+    //if it is not a complete sponsor time
+    if (sponsorTimes[index].length < 2) {
+      chrome.tabs.query({
+        active: true,
+        currentWindow: true
+      }, function(tabs) {
+        chrome.tabs.sendMessage(tabs[0].id, {
+          message: "changeStartSponsorButton",
+          showStartSponsor: true,
+          uploadButtonVisible: false
+        });
+      });
+  
+      resetStartTimeChosen();
+    }
+  
+    sponsorTimes.splice(index, 1);
+  
+    //save this
+    let sponsorTimeKey = "sponsorTimes" + currentVideoID;
+    chrome.storage.sync.set({[sponsorTimeKey]: sponsorTimes}, function() {
+      chrome.tabs.query({
+        active: true,
+        currentWindow: true
+      }, tabs => {
+        chrome.tabs.sendMessage(
+          tabs[0].id,
+          {message: "sponsorDataChanged"}
+        );
+      });
+    });
+  
+    //update display
+    displaySponsorTimes();
+  
+    //if they are all removed
+    if (sponsorTimes.length == 0) {
+      //update chrome tab
+      chrome.tabs.query({
+        active: true,
+        currentWindow: true
+      }, function(tabs) {
+        chrome.tabs.sendMessage(tabs[0].id, {
+          message: "changeStartSponsorButton",
+          showStartSponsor: true,
+          uploadButtonVisible: false
+        });
+      });
+  
+      //hide submission section
+      document.getElementById("submissionSection").style.display = "none";
+    }
+  }
+  
   function clearTimes() {
     //send new sponsor time state to tab
     if (sponsorTimes.length > 0) {
@@ -355,7 +652,17 @@ function clearTimes() {
     sponsorTimes = [];
   
     let sponsorTimeKey = "sponsorTimes" + currentVideoID;
-  chrome.storage.sync.set({[sponsorTimeKey]: sponsorTimes});
+    chrome.storage.sync.set({[sponsorTimeKey]: sponsorTimes}, function() {
+      chrome.tabs.query({
+        active: true,
+        currentWindow: true
+      }, tabs => {
+        chrome.tabs.sendMessage(
+          tabs[0].id,
+          {message: "sponsorDataChanged"}
+        );
+      });
+    });
   
     displaySponsorTimes();
   
@@ -365,10 +672,15 @@ function clearTimes() {
     resetStartTimeChosen();
   }
   
+  function getErrorMessage(lang, statusCode) {
+    if(lang.has(statusCode)) return lang.get(statusCode);
+    return lang.get('Unknown').concat(" Error code: ") + statusCode;
+  } 
+
   function submitTimes() {
     //make info message say loading
-  document.getElementById("submitTimesInfoMessage").innerText = "Loading...";
-  document.getElementById("submitTimesInfoMessageContainer").style.display = "unset";
+    SB.submitTimesInfoMessage.innerText = "Loading...";
+    SB.submitTimesInfoMessageContainer.style.display = "unset";
   
     if (sponsorTimes.length > 0) {
       chrome.runtime.sendMessage({
@@ -378,21 +690,16 @@ function submitTimes() {
         if (response != undefined) {
           if (response.statusCode == 200) {
             //hide loading message
-          document.getElementById("submitTimesInfoMessageContainer").style.display = "none";
+            SB.submitTimesInfoMessageContainer.style.display = "none";
 
             clearTimes();
-        } else if(response.statusCode == 400) {
-          document.getElementById("submitTimesInfoMessage").innerText = "Server said this request was invalid";
-          document.getElementById("submitTimesInfoMessageContainer").style.display = "unset";
-        } else if(response.statusCode == 429) {
-          document.getElementById("submitTimesInfoMessage").innerText = "You have submitted too many sponsor times for this one video, are you sure there are this many?";
-          document.getElementById("submitTimesInfoMessageContainer").style.display = "unset";
-        } else if(response.statusCode == 409) {
-          document.getElementById("submitTimesInfoMessage").innerText = "This has already been submitted before";
-          document.getElementById("submitTimesInfoMessageContainer").style.display = "unset";
           } else {
-          document.getElementById("submitTimesInfoMessage").innerText = "There was an error submitting your sponsor times, please try again later. Error code " + response.statusCode;
+            let errorMessage = getErrorMessage(EN_US, response.statusCode);
+
+            document.getElementById("submitTimesInfoMessage").innerText = errorMessage;
             document.getElementById("submitTimesInfoMessageContainer").style.display = "unset";
+
+            SB.submitTimesInfoMessageContainer.style.display = "unset";
           }
         }
       });
@@ -448,6 +755,74 @@ function showVideoPlayerControls() {
     SB.showVideoPlayerControls.style.display = "none";
   }
   
+  function hideInfoButtonPlayerControls() {
+    chrome.storage.sync.set({"hideInfoButtonPlayerControls": true});
+  
+    chrome.tabs.query({
+      active: true,
+      currentWindow: true
+    }, function(tabs) {
+      chrome.tabs.sendMessage(tabs[0].id, {
+        message: "changeInfoButtonPlayerControlsVisibility",
+        value: true
+      });
+    });
+  
+    SB.hideInfoButtonPlayerControls.style.display = "none";
+    SB.showInfoButtonPlayerControls.style.display = "unset";
+  }
+  
+  function showInfoButtonPlayerControls() {
+    chrome.storage.sync.set({"hideInfoButtonPlayerControls": false});
+  
+    chrome.tabs.query({
+      active: true,
+      currentWindow: true
+    }, function(tabs) {
+      chrome.tabs.sendMessage(tabs[0].id, {
+        message: "changeVideoPlayerCochangeInfoButtonPlayerControlsVisibilityntrolsVisibility",
+        value: false
+      });
+    });
+  
+    SB.hideInfoButtonPlayerControls.style.display = "unset";
+    SB.showInfoButtonPlayerControls.style.display = "none";
+  }
+  
+  function hideDeleteButtonPlayerControls() {
+    chrome.storage.sync.set({"hideDeleteButtonPlayerControls": true});
+  
+    chrome.tabs.query({
+      active: true,
+      currentWindow: true
+    }, function(tabs) {
+      chrome.tabs.sendMessage(tabs[0].id, {
+        message: "changeDeleteButtonPlayerControlsVisibility",
+        value: true
+      });
+    });
+  
+    SB.hideDeleteButtonPlayerControls.style.display = "none";
+    SB.showDeleteButtonPlayerControls.style.display = "unset";
+  }
+  
+  function showDeleteButtonPlayerControls() {
+    chrome.storage.sync.set({"hideDeleteButtonPlayerControls": false});
+  
+    chrome.tabs.query({
+      active: true,
+      currentWindow: true
+    }, function(tabs) {
+      chrome.tabs.sendMessage(tabs[0].id, {
+        message: "changeVideoPlayerCochangeDeleteButtonPlayerControlsVisibilityntrolsVisibility",
+        value: false
+      });
+    });
+  
+    SB.hideDeleteButtonPlayerControls.style.display = "unset";
+    SB.showDeleteButtonPlayerControls.style.display = "none";
+  }
+  
   function disableSponsorViewTracking() {
     chrome.storage.sync.set({"trackViewCount": false});
   
@@ -483,7 +858,7 @@ function enableSponsorViewTracking() {
   }
   
   function updateStartTimeChosen() {
-  //update startTimeChosen variable
+    //update startTimeChosen letiable
     if (!startTimeChosen) {
       startTimeChosen = true;
     SB.sponsorStart.innerHTML = "Sponsorship Ends Now";
@@ -561,8 +936,12 @@ function vote(type, UUID) {
           //failure: duplicate vote
           addVoteMessage("You have already voted this way before.", UUID)
         } else if (response.successType == -1) {
-        //failure: duplicate vote
-        addVoteMessage("A connection error has occured.", UUID)
+          if (response.statusCode == 502) {
+            addVoteMessage("It seems the sever is down. Contact the dev immediately.", UUID)
+          } else {
+            //failure: unknown error
+            addVoteMessage("A connection error has occured. Error code: " + response.statusCode, UUID)
+          }
         }
       }
     });
@@ -588,6 +967,24 @@ function getFormattedTime(seconds) {
     return formatted;
   }
   
+  //converts time in seconds to minutes
+  function getTimeInMinutes(seconds) {
+    let minutes = Math.floor(seconds / 60);
+  
+    return minutes;
+  }
+  
+  //converts time in seconds to seconds past the last minute
+  function getTimeInFormattedSeconds(seconds) {
+    let secondsFormatted = (seconds % 60).toFixed(3);
+  
+    if (secondsFormatted < 10) {
+      secondsFormatted = "0" + secondsFormatted;
+    }
+  
+    return secondsFormatted;
+  }
+  
   function sendRequestToServer(type, address, callback) {
     let xmlhttp = new XMLHttpRequest();
   
@@ -607,8 +1004,20 @@ function sendRequestToServer(type, address, callback) {
     xmlhttp.send();
   }
   
-function getYouTubeVideoID(url) { // Return video id or false
+  function getYouTubeVideoID(url) { // Returns with video id else returns false
     var regExp = /^.*((youtu.be\/)|(v\/)|(\/u\/\w\/)|(embed\/)|(watch\?))\??v?=?([^#\&\?]*).*/;
     var match = url.match(regExp);
-  return (match && match[7].length == 11) ? match[7] : false;
+    var id = new URL(url).searchParams.get("v");
+    return (match && match[7].length == 11) ? id : false;
+  }
+  
+//end of function
+}
+
+if (chrome.tabs != undefined) {
+  //add the width restriction (because Firefox)
+  document.getElementById("sponorBlockStyleSheet").sheet.insertRule('.popupBody { width: 300 }', 0);
+
+  //this means it is actually opened in the popup
+  runThePopup();
 }