Merged into master

popup.js

@@ -1,4 +1,27 @@
 
+//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 = {};
 
   ["sponsorStart",
@@ -54,16 +77,16 @@ SB.hideDiscordButton.addEventListener("click", hideDiscordButton);
   
   
   //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) {
@@ -85,7 +108,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;
@@ -168,6 +191,7 @@ chrome.tabs.query({
       currentWindow: true
   }, loadTabData);
   
+  
   function loadTabData(tabs) {
     //set current videoID
     currentVideoID = getYouTubeVideoID(tabs[0].url);
@@ -217,7 +241,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
@@ -280,7 +304,6 @@ function startSponsorCallback(response) {
   
   //display the video times from the array
   function displaySponsorTimes() {
-
     //remove all children
     while (SB.sponsorMessageTimes.firstChild) {
       SB.sponsorMessageTimes.removeChild(SB.sponsorMessageTimes.firstChild);
@@ -294,13 +317,13 @@ function displaySponsorTimes() {
   function displayDownloadedSponsorTimes(request) {
     if (request.sponsorTimes != undefined) {
       //set it to the message
-    SB.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");
@@ -315,13 +338,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));
   
@@ -380,13 +403,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));
   
@@ -396,7 +419,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++) {
@@ -433,36 +456,39 @@ function editSponsorTime(index) {
       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 = ":";
@@ -487,14 +513,13 @@ 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.replaceChild(saveButton, editButton);
-  sponsorTimesContainer.appendChild(saveButton);
   }
   
   function saveSponsorTimeEdit(index) {
@@ -512,6 +537,8 @@ function saveSponsorTimeEdit(index) {
     chrome.storage.sync.set({[sponsorTimeKey]: sponsorTimes});
   
     displaySponsorTimes();
+
+    showSubmitTimesIfNecessary();
   }
   
   //deletes the sponsor time submitted at an index
@@ -778,7 +805,7 @@ function enableSponsorViewTracking() {
   }
   
   function updateStartTimeChosen() {
-  //update startTimeChosen variable
+    //update startTimeChosen letiable
     if (!startTimeChosen) {
       startTimeChosen = true;
     SB.sponsorStart.innerHTML = "Sponsorship Ends Now";
@@ -930,3 +957,15 @@ function getYouTubeVideoID(url) { // Returns with video id else returns 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();
+}
+