diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 78b12c19..7a3e9064 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -82,16 +82,16 @@ "sponsorStart": { "message": "Sponsorship Starts Now" }, - "sponsorEND": { + "sponsorEnd": { "message": "Sponsorship Ends Now" }, - "noVIDEOID": { + "noVideoID": { "message": "This probably isn't a YouTube tab, or you clicked too early. \n If you know this is a YouTube tab,\n close this popup and open it again." }, "Voted": { "message": "Thanks for voting!" }, - "voteFAIL": { + "voteFail": { "message": "You have already voted this way before." }, "serverDown": { @@ -105,8 +105,5 @@ }, "leftTimes": { "message": "You seem to have left some sponsor times unsubmitted. Go back to that page to submit them (they are not deleted)." - }, - "Popup": { - "message": "popup_en.html" } } diff --git a/content.js b/content.js index eb3b254b..6495aed9 100644 --- a/content.js +++ b/content.js @@ -25,10 +25,9 @@ var channelURL; var channelWhitelisted = false; // create preview bar -let progressBar = document.getElementsByClassName("ytp-progress-bar-container")[0] || document.getElementsByClassName("no-model cue-range-markers")[0]; -var previewBar = new PreviewBar(progressBar); +var previewBar; -if(id = getYouTubeVideoID(document.URL)){ // Direct Links +if (id = getYouTubeVideoID(document.URL)) { // Direct Links videoIDChange(id); } @@ -203,10 +202,15 @@ document.onkeydown = function(e){ } function videoIDChange(id) { - //not a url change if (sponsorVideoID == id) return; + if (previewBar == null) { + //create it + let progressBar = document.getElementsByClassName("ytp-progress-bar-container")[0] || document.getElementsByClassName("no-model cue-range-markers")[0]; + previewBar = new PreviewBar(progressBar); + } + //warn them if they had unsubmitted times if (previousVideoID != null) { //get the sponsor times from storage @@ -325,7 +329,6 @@ function sponsorsLookup(id) { //update the preview bar //leave the type blank for now until categories are added - console.log(v.duration) if (isNaN(v.duration)) { //wait until it is loaded v.addEventListener('durationchange', updatePreviewBar); diff --git a/manifest.json b/manifest.json index b2ea0914..90cdaad3 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_fullName__", "short_name": "__MSG_Name__", - "version": "1.0.35", + "version": "1.0.36", "default_locale": "en", "description": "__MSG_Description__", "content_scripts": [ @@ -44,7 +44,7 @@ ], "browser_action": { "default_title": "__MSG_Name__", - "default_popup": "__MSG_Popup__" + "default_popup": "popup.html" }, "background": { "scripts":[ diff --git a/popup.css b/popup.css index 1d5dd91e..ae3f79dc 100644 --- a/popup.css +++ b/popup.css @@ -51,6 +51,10 @@ h1.popupElement { padding: 5px; } +.discreteLink.popupElement { + color: black; +} + .recordingSubtitle.popupElement { margin-bottom: 10px; } diff --git a/popup_en.html b/popup.html similarity index 97% rename from popup_en.html rename to popup.html index 0c829494..bb5e16cc 100644 --- a/popup_en.html +++ b/popup.html @@ -1,6 +1,6 @@
-diff --git a/popup.js b/popup.js index 76d7dba8..8bf8d020 100644 --- a/popup.js +++ b/popup.js @@ -233,7 +233,7 @@ function runThePopup() { if (sponsorTimesStorage != undefined && sponsorTimesStorage.length > 0) { if (sponsorTimesStorage[sponsorTimesStorage.length - 1] != undefined && sponsorTimesStorage[sponsorTimesStorage.length - 1].length < 2) { startTimeChosen = true; - SB.sponsorStart.innerHTML = chrome.i18n.getMessage("sponsorEND"); + SB.sponsorStart.innerHTML = chrome.i18n.getMessage("sponsorEnd"); } sponsorTimes = sponsorTimesStorage; @@ -966,7 +966,7 @@ function runThePopup() { //update startTimeChosen letiable if (!startTimeChosen) { startTimeChosen = true; - SB.sponsorStart.innerHTML = chrome.i18n.getMessage("sponsorEND"); + SB.sponsorStart.innerHTML = chrome.i18n.getMessage("sponsorEnd"); } else { resetStartTimeChosen(); } @@ -1051,7 +1051,7 @@ function runThePopup() { //this is not a YouTube video page function displayNoVideo() { - document.getElementById("loadingIndicator").innerHTML = chrome.i18n.getMessage("sponsor404"); + document.getElementById("loadingIndicator").innerHTML = chrome.i18n.getMessage("noVideoID"); } function reportAnIssue() { @@ -1091,7 +1091,7 @@ function runThePopup() { addVoteMessage(chrome.i18n.getMessage("Voted"), UUID) } else if (response.successType == 0) { //failure: duplicate vote - addVoteMessage(chrome.i18n.getMessage("voteFAIL"), UUID) + addVoteMessage(chrome.i18n.getMessage("voteFail"), UUID) } else if (response.successType == -1) { if (response.statusCode == 502) { addVoteMessage(chrome.i18n.getMessage("serverDown"), UUID)