Merge pull request #56 from ajayyy/experimental

Added help page on install

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
 
@@ -652,7 +656,8 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
  
-    SponsorBlock  Copyright (C) 2019  Ajay Ramachandran and other SponsorBlock contributors
+    <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.

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) {
@@ -162,6 +178,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.js

@@ -59,8 +59,10 @@ chrome.storage.sync.get(["dontShowNoticeAgain"], function(result) {
   }
 });
 
-chrome.runtime.onMessage.addListener( // Detect URL Changes
-  function(request, sender, sendResponse) {
+//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);
@@ -118,7 +120,7 @@ chrome.runtime.onMessage.addListener( // Detect URL Changes
     if (request.message == "trackViewCount") {
       trackViewCount = request.value;
     }
-});
+}
 
 //check for hotkey pressed
 document.onkeydown = function(e){
@@ -474,13 +476,11 @@ function openInfoMenu() {
   //hide info button
   document.getElementById("infoButton").style.display = "none";
 
-  let popup = document.createElement("div");
+  sendRequestToCustomServer('GET', chrome.extension.getURL("popup.html"), function(xmlhttp) {
+    if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+      var popup = document.createElement("div");
       popup.id = "sponsorBlockPopupContainer";
-
-  let popupFrame = document.createElement("iframe");
-  popupFrame.id = "sponsorBlockPopupFrame"
-  popupFrame.src = chrome.extension.getURL("popup.html");
-  popupFrame.className = "popup";
+      popup.innerHTML = xmlhttp.responseText
 
       //close button
       let closeButton = document.createElement("div");
@@ -489,8 +489,8 @@ function openInfoMenu() {
       closeButton.setAttribute("align", "center");
       closeButton.addEventListener("click", closeInfoMenu);
 
-  popup.appendChild(closeButton);
-  popup.appendChild(popupFrame);
+      //add the close button
+      popup.prepend(closeButton);
     
       let parentNode = document.getElementById("secondary");
       if (parentNode == null) {
@@ -498,7 +498,21 @@ function openInfoMenu() {
         parentNode = document.getElementById("watch7-sidebar-contents");
       }
 
-  parentNode.prepend(popup);
+      //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() {

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"
       ]
     }
   ],
@@ -29,7 +31,9 @@
     "icons/downvote.png",
     "icons/PlayerInfoIconSponsorBlocker256px.png",
     "icons/PlayerDeleteIconSponsorBlocker256px.png",
-    "popup.html"
+    "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> 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></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,7 +1,7 @@
 {
   "name": "SponsorBlock for YouTube - Skip Sponsorships",
   "short_name": "SponsorBlock",
-  "version": "1.0.16",
+  "version": "1.0.23",
   "description": "Skip over sponsorship on YouTube videos. Report sponsors on videos you watch to save the time of others.",
   "content_scripts": [
     {
@@ -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"
       ]
     }
   ],
@@ -29,7 +31,9 @@
     "icons/downvote.png",
     "icons/PlayerInfoIconSponsorBlocker256px.png",
     "icons/PlayerDeleteIconSponsorBlocker256px.png",
-    "popup.html"
+    "popup.html",
+    "help/index.html",
+    "help/style.css"
   ],
   "permissions": [
     "tabs",

popup.css

@@ -1,45 +1,84 @@
-* {
-  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;
-  min-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;
 }
 
-.sponsorTime {
+.sponsorTime.popupElement {
 	font-size: 20px;
 }
 
-.smallLink {
+.smallLink.popupElement {
 	font-size: 10px;
 	text-decoration: underline;
 	cursor: pointer;
 }
 
-.mediumLink {
+.mediumLink.popupElement {
 	font-size: 15px;
 	padding-left: 15px;
 	padding-right: 15px;
@@ -47,7 +86,7 @@ body {
 	cursor: pointer;
 }
 
-.greenButton {
+.greenButton.popupElement {
   background-color:#ec1c1c;
   -moz-border-radius:28px;
   -webkit-border-radius:28px;
@@ -61,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;
@@ -90,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;
@@ -119,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;
@@ -144,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,25 +112,25 @@
 
               <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 Buttons On YouTube Player</button>
-              <button id="showVideoPlayerControls" style="display: none" class="warningButton">Show Buttons 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>
+                <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 
@@ -139,30 +140,30 @@
                 <br/>
                 <br/>
 
-              <button id="hideInfoButtonPlayerControls" class="warningButton">Hide Info Button On YouTube Player</button>
-              <button id="showInfoButtonPlayerControls" style="display: none" class="warningButton">Show Info Button On YouTube Player</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">Hide Delete Button On YouTube Player</button>
-              <button id="showDeleteButtonPlayerControls" style="display: none" class="warningButton">Show Delete Button On YouTube Player</button>
+                <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>
+                <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">Disable Sponsor View Tracking</button>
-              <button id="enableSponsorViewTracking" style="display: none" class="warningButton">Enable Sponsor View Tracking</button>
+                <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>
+                <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
@@ -172,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,65 +1,88 @@
 
-// References
-var SB = {};
+//make this a function to allow this to run on the content page
+function runThePopup() {
 
-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.hideInfoButtonPlayerControls = document.getElementById("hideInfoButtonPlayerControls");
-SB.showInfoButtonPlayerControls = document.getElementById("showInfoButtonPlayerControls");
-SB.hideDeleteButtonPlayerControls = document.getElementById("hideDeleteButtonPlayerControls");
-SB.showDeleteButtonPlayerControls = document.getElementById("showDeleteButtonPlayerControls");
-SB.disableSponsorViewTracking = document.getElementById("disableSponsorViewTracking");
-SB.enableSponsorViewTracking = document.getElementById("enableSponsorViewTracking");
-SB.optionsButton = document.getElementById("optionsButton");
-SB.reportAnIssue = document.getElementById("reportAnIssue");
-// sponsorTimesContributions
-SB.sponsorTimesContributionsContainer = document.getElementById("sponsorTimesContributionsContainer");
-SB.sponsorTimesContributionsDisplay = document.getElementById("sponsorTimesContributionsDisplay");
-SB.sponsorTimesContributionsDisplayEndWord = document.getElementById("sponsorTimesContributionsDisplayEndWord");
-// sponsorTimesViewsDisplay
-SB.sponsorTimesViewsContainer = document.getElementById("sponsorTimesViewsDisplayContainer");
-SB.sponsorTimesViewsDisplay = document.getElementById("sponsorTimesViewsDisplayDisplay");
-SB.sponsorTimesViewsDisplayEndWord = document.getElementById("sponsorTimesViewsDisplayDisplayEndWord");
-// discordButtons
-SB.discordButtonContainer = document.getElementById("discordButtonContainer");
-SB.hideDiscordButton = document.getElementById("hideDiscordButton");
+  //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);
+      }
   
-//setup click listeners
-SB.sponsorStart.addEventListener("click", sendSponsorStartMessage);
-SB.clearTimes.addEventListener("click", clearTimes);
-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);
+      //add a dummy query method
+      chrome.tabs.query = function(config, callback) {
+          callback([{
+              url: document.URL,
+              id: -1
+          }]);
+      }
+  
+      inPopup = false;
+  }
+  
+  // References
+  let 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.hideInfoButtonPlayerControls = document.getElementById("hideInfoButtonPlayerControls");
+  SB.showInfoButtonPlayerControls = document.getElementById("showInfoButtonPlayerControls");
+  SB.hideDeleteButtonPlayerControls = document.getElementById("hideDeleteButtonPlayerControls");
+  SB.showDeleteButtonPlayerControls = document.getElementById("showDeleteButtonPlayerControls");
+  SB.disableSponsorViewTracking = document.getElementById("disableSponsorViewTracking");
+  SB.enableSponsorViewTracking = document.getElementById("enableSponsorViewTracking");
+  SB.optionsButton = document.getElementById("optionsButton");
+  SB.reportAnIssue = document.getElementById("reportAnIssue");
+  // sponsorTimesContributions
+  SB.sponsorTimesContributionsContainer = document.getElementById("sponsorTimesContributionsContainer");
+  SB.sponsorTimesContributionsDisplay = document.getElementById("sponsorTimesContributionsDisplay");
+  SB.sponsorTimesContributionsDisplayEndWord = document.getElementById("sponsorTimesContributionsDisplayEndWord");
+  // sponsorTimesViewsDisplay
+  SB.sponsorTimesViewsContainer = document.getElementById("sponsorTimesViewsDisplayContainer");
+  SB.sponsorTimesViewsDisplay = document.getElementById("sponsorTimesViewsDisplayDisplay");
+  SB.sponsorTimesViewsDisplayEndWord = document.getElementById("sponsorTimesViewsDisplayDisplayEndWord");
+  // discordButtons
+  SB.discordButtonContainer = document.getElementById("discordButtonContainer");
+  SB.hideDiscordButton = document.getElementById("hideDiscordButton");
+  
+  //setup click listeners
+  SB.sponsorStart.addEventListener("click", sendSponsorStartMessage);
+  SB.clearTimes.addEventListener("click", clearTimes);
+  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);
   
   
-//if true, the button now selects the end time
-var startTimeChosen = false;
+  //if true, the button now selects the end time
+  let startTimeChosen = false;
   
-//the start and end time pairs (2d)
-var sponsorTimes = [];
+  //the start and end time pairs (2d)
+  let sponsorTimes = [];
   
-//current video ID of this tab
-var currentVideoID = null;
+  //current video ID of this tab
+  let currentVideoID = null;
   
-//is this a YouTube tab?
-var isYouTubeTab = false;
+  //is this a YouTube tab?
+  let isYouTubeTab = false;
   
-//see if discord link can be shown
-chrome.storage.sync.get(["hideDiscordLink"], function(result) {
+  //see if discord link can be shown
+  chrome.storage.sync.get(["hideDiscordLink"], function(result) {
     let hideDiscordLink = result.hideDiscordLink;
     if (hideDiscordLink == undefined || !hideDiscordLink) {
       chrome.storage.sync.get(["hideDiscordLaunches"], function(result) {
@@ -76,51 +99,51 @@ chrome.storage.sync.get(["hideDiscordLink"], function(result) {
         }
       });
     }
-});
+  });
   
-//if the don't show notice again variable is true, an option to 
-//  disable should be available
-chrome.storage.sync.get(["dontShowNoticeAgain"], function(result) {
+  //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;
     if (dontShowNoticeAgain != undefined && dontShowNoticeAgain) {
       SB.showNoticeAgain.style.display = "unset";
     }
-});
+  });
   
-//show proper video player controls options
-chrome.storage.sync.get(["hideVideoPlayerControls"], function(result) {
+  //show proper video player controls options
+  chrome.storage.sync.get(["hideVideoPlayerControls"], function(result) {
     let hideVideoPlayerControls = result.hideVideoPlayerControls;
     if (hideVideoPlayerControls != undefined && hideVideoPlayerControls) {
       SB.hideVideoPlayerControls.style.display = "none";
       SB.showVideoPlayerControls.style.display = "unset";
     }
-});
-chrome.storage.sync.get(["hideInfoButtonPlayerControls"], function(result) {
+  });
+  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) {
+  });
+  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) {
+  //show proper tracking option
+  chrome.storage.sync.get(["trackViewCount"], function(result) {
     let trackViewCount = result.trackViewCount;
     if (trackViewCount != undefined && !trackViewCount) {
       SB.disableSponsorViewTracking.style.display = "none";
       SB.enableSponsorViewTracking.style.display = "unset";
     }
-});
+  });
   
-//get the amount of times this user has contributed and display it to thank them
-chrome.storage.sync.get(["sponsorTimesContributed"], function(result) {
+  //get the amount of times this user has contributed and display it to thank them
+  chrome.storage.sync.get(["sponsorTimesContributed"], function(result) {
     if (result.sponsorTimesContributed != undefined) {
       if (result.sponsorTimesContributed > 1) {
         SB.sponsorTimesContributionsDisplayEndWord.innerText = "sponsors."
@@ -153,15 +176,16 @@ chrome.storage.sync.get(["sponsorTimesContributed"], function(result) {
         }
       });
     }
-});
+  });
   
   
-chrome.tabs.query({
+  chrome.tabs.query({
       active: true,
       currentWindow: true
-}, loadTabData);
+  }, loadTabData);
   
-function loadTabData(tabs) {
+  
+  function loadTabData(tabs) {
     //set current videoID
     currentVideoID = getYouTubeVideoID(tabs[0].url);
   
@@ -198,9 +222,9 @@ function loadTabData(tabs) {
       {message: 'isInfoFound'},
       infoFound
     );
-}
+  }
   
-function infoFound(request) {
+  function infoFound(request) {
     if(chrome.runtime.lastError) {
       //This page doesn't have the injected content script, or at least not yet
       displayNoVideo();
@@ -210,7 +234,7 @@ 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
@@ -225,16 +249,16 @@ function infoFound(request) {
         document.getElementById("videoFound").innerHTML = "No sponsors found"
       }
     }
-}
+  }
   
-function setVideoID(request) {
+  function setVideoID(request) {
     //if request is undefined, then the page currently being browsed is not YouTube
     if (request != undefined) {
       videoID = request.videoID;
     }
-}
+  }
   
-function sendSponsorStartMessage() {
+  function sendSponsorStartMessage() {
       //the content script will get the message if a YouTube page is open
       chrome.tabs.query({
         active: true,
@@ -246,9 +270,9 @@ function sendSponsorStartMessage() {
           startSponsorCallback
         );
       });
-}
+  }
   
-function startSponsorCallback(response) {
+  function startSponsorCallback(response) {
     let sponsorTimesIndex = sponsorTimes.length - (startTimeChosen ? 1 : 0);
   
     if (sponsorTimes[sponsorTimesIndex] == undefined) {
@@ -269,10 +293,10 @@ function startSponsorCallback(response) {
     document.getElementById("submissionSection").style.display = "unset";
   
     showSubmitTimesIfNecessary();
-}
+  }
   
-//display the video times from the array
-function displaySponsorTimes() {
+  //display the video times from the array
+  function displaySponsorTimes() {
     //set it to the message
     let sponsorMessageTimes = document.getElementById("sponsorMessageTimes");
   
@@ -283,10 +307,10 @@ function displaySponsorTimes() {
   
     //add sponsor times
     sponsorMessageTimes.appendChild(getSponsorTimesMessageDiv(sponsorTimes));
-}
+  }
   
-//display the video times from the array at the top, in a different section
-function displayDownloadedSponsorTimes(request) {
+  //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);
@@ -295,7 +319,7 @@ function displayDownloadedSponsorTimes(request) {
       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");
@@ -310,13 +334,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));
   
@@ -341,10 +365,10 @@ function displayDownloadedSponsorTimes(request) {
         }
       }
     }
-}
+  }
   
-//get the message that visually displays the video times
-function getSponsorTimesMessage(sponsorTimes) {
+  //get the message that visually displays the video times
+  function getSponsorTimesMessage(sponsorTimes) {
     let sponsorTimesMessage = "";
   
     for (let i = 0; i < sponsorTimes.length; i++) {
@@ -363,11 +387,11 @@ 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) {
+  //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";
@@ -375,13 +399,13 @@ function getSponsorTimesMessageDiv(sponsorTimes) {
     for (let i = 0; i < sponsorTimes.length; i++) {
       let currentSponsorTimeContainer = document.createElement("div");
       currentSponsorTimeContainer.id = "sponsorTimeContainer" + i;
-    currentSponsorTimeContainer.className = "sponsorTime";
+      currentSponsorTimeContainer.className = "sponsorTime popupElement";
       let currentSponsorTimeMessage = "";
   
       let deleteButton = document.createElement("span");
       deleteButton.id = "sponsorTimeDeleteButton" + i;
       deleteButton.innerText = "Delete";
-    deleteButton.className = "mediumLink";
+      deleteButton.className = "mediumLink popupElement";
       let index = i;
       deleteButton.addEventListener("click", () => deleteSponsorTime(index));
   
@@ -391,7 +415,7 @@ function getSponsorTimesMessageDiv(sponsorTimes) {
       let editButton = document.createElement("span");
       editButton.id = "sponsorTimeEditButton" + i;
       editButton.innerText = "Edit";
-    editButton.className = "mediumLink";
+      editButton.className = "mediumLink popupElement";
       editButton.addEventListener("click", () => editSponsorTime(index));
   
       for (let s = 0; s < sponsorTimes[i].length; s++) {
@@ -420,44 +444,47 @@ function getSponsorTimesMessageDiv(sponsorTimes) {
     }
   
     return sponsorTimesContainer;
-}
+  }
   
-function editSponsorTime(index) {
+  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";
+    startTimeMinutes.className = "sponsorTime popupElement";
     startTimeMinutes.type = "text";
     startTimeMinutes.value = getTimeInMinutes(sponsorTimes[index][0]);
-  startTimeMinutes.style.width = "45";
+    startTimeMinutes.style.width = "45px";
     
     let startTimeSeconds = document.createElement("input");
     startTimeSeconds.id = "startTimeSeconds" + index;
-  startTimeSeconds.className = "sponsorTime";
+    startTimeSeconds.className = "sponsorTime popupElement";
     startTimeSeconds.type = "text";
     startTimeSeconds.value = getTimeInFormattedSeconds(sponsorTimes[index][0]);
-  startTimeSeconds.style.width = "60";
+    startTimeSeconds.style.width = "60px";
   
     let endTimeMinutes = document.createElement("input");
     endTimeMinutes.id = "endTimeMinutes" + index;
-  endTimeMinutes.className = "sponsorTime";
+    endTimeMinutes.className = "sponsorTime popupElement";
     endTimeMinutes.type = "text";
     endTimeMinutes.value = getTimeInMinutes(sponsorTimes[index][1]);
-  endTimeMinutes.style.width = "45";
+    endTimeMinutes.style.width = "45px";
     
     let endTimeSeconds = document.createElement("input");
     endTimeSeconds.id = "endTimeSeconds" + index;
-  endTimeSeconds.className = "sponsorTime";
+    endTimeSeconds.className = "sponsorTime popupElement";
     endTimeSeconds.type = "text";
     endTimeSeconds.value = getTimeInFormattedSeconds(sponsorTimes[index][1]);
-  endTimeSeconds.style.width = "60";
+    endTimeSeconds.style.width = "60px";
   
     let colonText = document.createElement("span");
     colonText.innerText = ":";
@@ -482,17 +509,16 @@ function editSponsorTime(index) {
     let saveButton = document.createElement("span");
     saveButton.id = "sponsorTimeSaveButton" + index;
     saveButton.innerText = "Save";
-  saveButton.className = "mediumLink";
+    saveButton.className = "mediumLink popupElement";
     saveButton.addEventListener("click", () => saveSponsorTimeEdit(index));
   
     let editButton = document.getElementById("sponsorTimeEditButton" + index);
     let sponsorTimesContainer = document.getElementById("sponsorTimesContainer");
   
-  sponsorTimesContainer.removeChild(editButton);
-  sponsorTimesContainer.appendChild(saveButton);
-}
+    sponsorTimesContainer.replaceChild(saveButton, editButton);
+  }
   
-function saveSponsorTimeEdit(index) {
+  function saveSponsorTimeEdit(index) {
     let startTimeMinutes = document.getElementById("startTimeMinutes" + index);
     let startTimeSeconds = document.getElementById("startTimeSeconds" + index);
   
@@ -507,10 +533,12 @@ function saveSponsorTimeEdit(index) {
     chrome.storage.sync.set({[sponsorTimeKey]: sponsorTimes});
   
     displaySponsorTimes();
-}
 
-//deletes the sponsor time submitted at an index
-function deleteSponsorTime(index) {
+    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({
@@ -553,9 +581,9 @@ function deleteSponsorTime(index) {
       //hide submission section
       document.getElementById("submissionSection").style.display = "none";
     }
-}
+  }
   
-function clearTimes() {
+  function clearTimes() {
     //send new sponsor time state to tab
     if (sponsorTimes.length > 0) {
       chrome.tabs.query({
@@ -582,9 +610,9 @@ function clearTimes() {
     document.getElementById("submissionSection").style.display = "none";
   
     resetStartTimeChosen();
-}
+  }
   
-function submitTimes() {
+  function submitTimes() {
     //make info message say loading
     document.getElementById("submitTimesInfoMessage").innerText = "Loading...";
     document.getElementById("submitTimesInfoMessageContainer").style.display = "unset";
@@ -619,9 +647,9 @@ function submitTimes() {
         }
       });
     }
-}
+  }
   
-function showNoticeAgain() {
+  function showNoticeAgain() {
     chrome.storage.sync.set({"dontShowNoticeAgain": false});
   
     chrome.tabs.query({
@@ -634,9 +662,9 @@ function showNoticeAgain() {
     });
   
     SB.showNoticeAgain.style.display = "none";
-}
+  }
   
-function hideVideoPlayerControls() {
+  function hideVideoPlayerControls() {
     chrome.storage.sync.set({"hideVideoPlayerControls": true});
   
     chrome.tabs.query({
@@ -651,9 +679,9 @@ function hideVideoPlayerControls() {
   
     SB.hideVideoPlayerControls.style.display = "none";
     SB.showVideoPlayerControls.style.display = "unset";
-}
+  }
   
-function showVideoPlayerControls() {
+  function showVideoPlayerControls() {
     chrome.storage.sync.set({"hideVideoPlayerControls": false});
   
     chrome.tabs.query({
@@ -668,9 +696,9 @@ function showVideoPlayerControls() {
   
     SB.hideVideoPlayerControls.style.display = "unset";
     SB.showVideoPlayerControls.style.display = "none";
-}
+  }
   
-function hideInfoButtonPlayerControls() {
+  function hideInfoButtonPlayerControls() {
     chrome.storage.sync.set({"hideInfoButtonPlayerControls": true});
   
     chrome.tabs.query({
@@ -685,9 +713,9 @@ function hideInfoButtonPlayerControls() {
   
     SB.hideInfoButtonPlayerControls.style.display = "none";
     SB.showInfoButtonPlayerControls.style.display = "unset";
-}
+  }
   
-function showInfoButtonPlayerControls() {
+  function showInfoButtonPlayerControls() {
     chrome.storage.sync.set({"hideInfoButtonPlayerControls": false});
   
     chrome.tabs.query({
@@ -702,9 +730,9 @@ function showInfoButtonPlayerControls() {
   
     SB.hideInfoButtonPlayerControls.style.display = "unset";
     SB.showInfoButtonPlayerControls.style.display = "none";
-}
+  }
   
-function hideDeleteButtonPlayerControls() {
+  function hideDeleteButtonPlayerControls() {
     chrome.storage.sync.set({"hideDeleteButtonPlayerControls": true});
   
     chrome.tabs.query({
@@ -719,9 +747,9 @@ function hideDeleteButtonPlayerControls() {
   
     SB.hideDeleteButtonPlayerControls.style.display = "none";
     SB.showDeleteButtonPlayerControls.style.display = "unset";
-}
+  }
   
-function showDeleteButtonPlayerControls() {
+  function showDeleteButtonPlayerControls() {
     chrome.storage.sync.set({"hideDeleteButtonPlayerControls": false});
   
     chrome.tabs.query({
@@ -736,9 +764,9 @@ function showDeleteButtonPlayerControls() {
   
     SB.hideDeleteButtonPlayerControls.style.display = "unset";
     SB.showDeleteButtonPlayerControls.style.display = "none";
-}
+  }
   
-function disableSponsorViewTracking() {
+  function disableSponsorViewTracking() {
     chrome.storage.sync.set({"trackViewCount": false});
   
     chrome.tabs.query({
@@ -753,9 +781,9 @@ function disableSponsorViewTracking() {
   
     SB.disableSponsorViewTracking.style.display = "none";
     SB.enableSponsorViewTracking.style.display = "unset";
-}
+  }
   
-function enableSponsorViewTracking() {
+  function enableSponsorViewTracking() {
     chrome.storage.sync.set({"trackViewCount": true});
   
     chrome.tabs.query({
@@ -770,26 +798,26 @@ function enableSponsorViewTracking() {
   
     SB.enableSponsorViewTracking.style.display = "none";
     SB.disableSponsorViewTracking.style.display = "unset";
-}
+  }
   
-function updateStartTimeChosen() {
-  //update startTimeChosen variable
+  function updateStartTimeChosen() {
+    //update startTimeChosen letiable
     if (!startTimeChosen) {
       startTimeChosen = true;
     SB.sponsorStart.innerHTML = "Sponsorship Ends Now";
     } else {
       resetStartTimeChosen();
     }
-}
+  }
   
-//set it to false
-function resetStartTimeChosen() {
+  //set it to false
+  function resetStartTimeChosen() {
     startTimeChosen = false;
     SB.sponsorStart.innerHTML = "Sponsorship Starts Now";
-}
+  }
   
-//hides and shows the submit times button when needed
-function showSubmitTimesIfNecessary() {
+  //hides and shows the submit times button when needed
+  function showSubmitTimesIfNecessary() {
     //check if an end time has been specified for the latest sponsor time
     if (sponsorTimes.length > 0 && sponsorTimes[sponsorTimes.length - 1].length > 1) {
       //show submit times button
@@ -798,26 +826,26 @@ function showSubmitTimesIfNecessary() {
       //hide submit times button
       document.getElementById("submitTimesContainer").style.display = "none";
     }
-}
+  }
   
-//make the options div visisble
-function openOptions() {
+  //make the options div visisble
+  function openOptions() {
     document.getElementById("optionsButtonContainer").style.display = "none";
     document.getElementById("options").style.display = "unset";
-}
+  }
   
-//this is not a YouTube video page
-function displayNoVideo() {
+  //this is not a YouTube video page
+  function displayNoVideo() {
     document.getElementById("loadingIndicator").innerHTML = "This probably isn't a YouTube tab, or you clicked too early. " +
         "If you know this is a YouTube tab, close this popup and open it again.";
-}
+  }
   
-function reportAnIssue() {
+  function reportAnIssue() {
     document.getElementById("issueReporterContainer").style.display = "unset";
     SB.reportAnIssue.style.display = "none";
-}
+  }
   
-function addVoteMessage(message, UUID) {
+  function addVoteMessage(message, UUID) {
     let container = document.getElementById("sponsorTimesVoteButtonsContainer" + UUID);
     //remove all children
     while (container.firstChild) {
@@ -830,9 +858,9 @@ function addVoteMessage(message, UUID) {
     thanksForVotingText.style.marginBottom = "0px";
   
     container.appendChild(thanksForVotingText);
-}
+  }
   
-function vote(type, UUID) {
+  function vote(type, UUID) {
     //add loading info
     addVoteMessage("Loading...", UUID)
   
@@ -860,16 +888,16 @@ function vote(type, UUID) {
         }
       }
     });
-}
+  }
   
-function hideDiscordButton() {
+  function hideDiscordButton() {
     chrome.storage.sync.set({"hideDiscordLink": false});
   
     SB.discordButtonContainer.style.display = "none";
-}
+  }
   
-//converts time in seconds to minutes:seconds
-function getFormattedTime(seconds) {
+  //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) {
@@ -880,17 +908,17 @@ function getFormattedTime(seconds) {
     let formatted = minutes+ ":" + secondsDisplay;
   
     return formatted;
-}
+  }
   
-//converts time in seconds to minutes
-function getTimeInMinutes(seconds) {
+  //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) {
+  //converts time in seconds to seconds past the last minute
+  function getTimeInFormattedSeconds(seconds) {
     let secondsFormatted = (seconds % 60).toFixed(3);
   
     if (secondsFormatted < 10) {
@@ -898,9 +926,9 @@ function getTimeInFormattedSeconds(seconds) {
     }
   
     return secondsFormatted;
-}
+  }
   
-function sendRequestToServer(type, address, callback) {
+  function sendRequestToServer(type, address, callback) {
     let xmlhttp = new XMLHttpRequest();
   
     xmlhttp.open(type, serverAddress + address, true);
@@ -917,10 +945,23 @@ function sendRequestToServer(type, address, callback) {
   
     //submit this request
     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();
+}
+