mirror of
https://github.com/ajayyy/SponsorBlock.git
synced 2025-12-10 21:47:06 +03:00
Add indicator where current player is for segments in popup
This commit is contained in:
@@ -219,6 +219,15 @@
|
|||||||
.segmentSummary > div {
|
.segmentSummary > div {
|
||||||
text-align: left;
|
text-align: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.segmentActive {
|
||||||
|
color: #bdfffb;
|
||||||
|
}
|
||||||
|
|
||||||
|
.segmentPassed {
|
||||||
|
color: #adadad;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Category dot in segment
|
* Category dot in segment
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -14,6 +14,8 @@ const utils = new Utils({
|
|||||||
unregisterFirefoxContentScript
|
unregisterFirefoxContentScript
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const popupPort: Record<string, chrome.runtime.Port> = {};
|
||||||
|
|
||||||
// Used only on Firefox, which does not support non persistent background pages.
|
// Used only on Firefox, which does not support non persistent background pages.
|
||||||
const contentScriptRegistrations = {};
|
const contentScriptRegistrations = {};
|
||||||
|
|
||||||
@@ -53,7 +55,7 @@ if (!Config.configSyncListeners.includes(onNavigationApiAvailableChange)) {
|
|||||||
Config.configSyncListeners.push(onNavigationApiAvailableChange);
|
Config.configSyncListeners.push(onNavigationApiAvailableChange);
|
||||||
}
|
}
|
||||||
|
|
||||||
chrome.runtime.onMessage.addListener(function (request, _, callback) {
|
chrome.runtime.onMessage.addListener(function (request, sender, callback) {
|
||||||
switch(request.message) {
|
switch(request.message) {
|
||||||
case "openConfig":
|
case "openConfig":
|
||||||
chrome.tabs.create({url: chrome.runtime.getURL('options/options.html' + (request.hash ? '#' + request.hash : ''))});
|
chrome.tabs.create({url: chrome.runtime.getURL('options/options.html' + (request.hash ? '#' + request.hash : ''))});
|
||||||
@@ -100,9 +102,25 @@ chrome.runtime.onMessage.addListener(function (request, _, callback) {
|
|||||||
});
|
});
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
case "time":
|
||||||
|
if (sender.tab) {
|
||||||
|
popupPort[sender.tab.id].postMessage(request);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
chrome.runtime.onConnect.addListener((port) => {
|
||||||
|
if (port.name === "popup") {
|
||||||
|
chrome.tabs.query({
|
||||||
|
active: true,
|
||||||
|
currentWindow: true
|
||||||
|
}, tabs => {
|
||||||
|
popupPort[tabs[0].id] = port;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
//add help page on install
|
//add help page on install
|
||||||
chrome.runtime.onInstalled.addListener(function () {
|
chrome.runtime.onInstalled.addListener(function () {
|
||||||
// This let's the config sync to run fully before checking.
|
// This let's the config sync to run fully before checking.
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ interface SBConfig {
|
|||||||
categoryPillUpdate: boolean,
|
categoryPillUpdate: boolean,
|
||||||
darkMode: boolean,
|
darkMode: boolean,
|
||||||
showCategoryGuidelines: boolean,
|
showCategoryGuidelines: boolean,
|
||||||
chaptersActivated: boolean,
|
chaptersAvailable: boolean,
|
||||||
|
|
||||||
// Used to cache calculated text color info
|
// Used to cache calculated text color info
|
||||||
categoryPillColors: {
|
categoryPillColors: {
|
||||||
@@ -175,7 +175,7 @@ const Config: SBObject = {
|
|||||||
categoryPillUpdate: false,
|
categoryPillUpdate: false,
|
||||||
darkMode: true,
|
darkMode: true,
|
||||||
showCategoryGuidelines: true,
|
showCategoryGuidelines: true,
|
||||||
chaptersActivated: true,
|
chaptersAvailable: true,
|
||||||
|
|
||||||
categoryPillColors: {},
|
categoryPillColors: {},
|
||||||
|
|
||||||
|
|||||||
@@ -167,6 +167,7 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
|
|||||||
sendResponse({
|
sendResponse({
|
||||||
found: sponsorDataFound,
|
found: sponsorDataFound,
|
||||||
sponsorTimes: sponsorTimes,
|
sponsorTimes: sponsorTimes,
|
||||||
|
time: video.currentTime,
|
||||||
onMobileYouTube
|
onMobileYouTube
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -208,6 +209,7 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
|
|||||||
sponsorsLookup(false).then(() => sendResponse({
|
sponsorsLookup(false).then(() => sendResponse({
|
||||||
found: sponsorDataFound,
|
found: sponsorDataFound,
|
||||||
sponsorTimes: sponsorTimes,
|
sponsorTimes: sponsorTimes,
|
||||||
|
time: video.currentTime,
|
||||||
onMobileYouTube
|
onMobileYouTube
|
||||||
}));
|
}));
|
||||||
|
|
||||||
@@ -532,7 +534,7 @@ function startSponsorSchedule(includeIntersectingSegments = false, currentTime?:
|
|||||||
}
|
}
|
||||||
lastTimeFromWaitingEvent = null;
|
lastTimeFromWaitingEvent = null;
|
||||||
|
|
||||||
previewBar?.updateChapterText(sponsorTimes, sponsorTimesSubmitting, currentTime);
|
updateActiveSegment(currentTime);
|
||||||
|
|
||||||
if (video.paused) return;
|
if (video.paused) return;
|
||||||
if (videoMuted && !inMuteSegment(currentTime)) {
|
if (videoMuted && !inMuteSegment(currentTime)) {
|
||||||
@@ -783,7 +785,7 @@ function setupVideoListeners() {
|
|||||||
|
|
||||||
startSponsorSchedule();
|
startSponsorSchedule();
|
||||||
} else {
|
} else {
|
||||||
previewBar?.updateChapterText(sponsorTimes, sponsorTimesSubmitting, video.currentTime);
|
updateActiveSegment(video.currentTime);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
video.addEventListener('ratechange', () => startSponsorSchedule());
|
video.addEventListener('ratechange', () => startSponsorSchedule());
|
||||||
@@ -2069,6 +2071,14 @@ function getSegmentsMessage(sponsorTimes: SponsorTime[]): string {
|
|||||||
return sponsorTimesMessage;
|
return sponsorTimesMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function updateActiveSegment(currentTime: number): void {
|
||||||
|
previewBar?.updateChapterText(sponsorTimes, sponsorTimesSubmitting, currentTime);
|
||||||
|
chrome.runtime.sendMessage({
|
||||||
|
message: "time",
|
||||||
|
time: currentTime
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function addPageListeners(): void {
|
function addPageListeners(): void {
|
||||||
const refreshListners = () => {
|
const refreshListners = () => {
|
||||||
if (!isVisible(video)) {
|
if (!isVisible(video)) {
|
||||||
|
|||||||
@@ -74,6 +74,7 @@ export type Message = BaseMessage & (DefaultMessage | BoolValueMessage | IsInfoF
|
|||||||
export interface IsInfoFoundMessageResponse {
|
export interface IsInfoFoundMessageResponse {
|
||||||
found: boolean;
|
found: boolean;
|
||||||
sponsorTimes: SponsorTime[];
|
sponsorTimes: SponsorTime[];
|
||||||
|
time: number;
|
||||||
onMobileYouTube: boolean;
|
onMobileYouTube: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,4 +112,11 @@ export interface VoteResponse {
|
|||||||
|
|
||||||
export interface ImportSegmentsResponse {
|
export interface ImportSegmentsResponse {
|
||||||
importedSegments: SponsorTime[];
|
importedSegments: SponsorTime[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface TimeUpdateMessage {
|
||||||
|
message: "time";
|
||||||
|
time: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type PopupMessage = TimeUpdateMessage;
|
||||||
|
|||||||
395
src/popup.ts
395
src/popup.ts
@@ -2,7 +2,7 @@ import Config from "./config";
|
|||||||
|
|
||||||
import Utils from "./utils";
|
import Utils from "./utils";
|
||||||
import { SponsorTime, SponsorHideType, ActionType, SegmentUUID, SponsorSourceType, StorageChangesObject, CategorySkipOption } from "./types";
|
import { SponsorTime, SponsorHideType, ActionType, SegmentUUID, SponsorSourceType, StorageChangesObject, CategorySkipOption } from "./types";
|
||||||
import { Message, MessageResponse, IsInfoFoundMessageResponse, ImportSegmentsResponse } from "./messageTypes";
|
import { Message, MessageResponse, IsInfoFoundMessageResponse, ImportSegmentsResponse, PopupMessage } from "./messageTypes";
|
||||||
import { showDonationLink } from "./utils/configUtils";
|
import { showDonationLink } from "./utils/configUtils";
|
||||||
import { AnimationUtils } from "./utils/animationUtils";
|
import { AnimationUtils } from "./utils/animationUtils";
|
||||||
import { GenericUtils } from "./utils/genericUtils";
|
import { GenericUtils } from "./utils/genericUtils";
|
||||||
@@ -81,6 +81,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
|
|||||||
Chapters
|
Chapters
|
||||||
}
|
}
|
||||||
let segmentTab = SegmentTab.Segments;
|
let segmentTab = SegmentTab.Segments;
|
||||||
|
let port: chrome.runtime.Port = null;
|
||||||
|
|
||||||
const PageElements: PageElements = {};
|
const PageElements: PageElements = {};
|
||||||
|
|
||||||
@@ -237,6 +238,8 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setupComPort();
|
||||||
|
|
||||||
//show proper disable skipping button
|
//show proper disable skipping button
|
||||||
const disableSkipping = Config.config.disableSkipping;
|
const disableSkipping = Config.config.disableSkipping;
|
||||||
if (disableSkipping != undefined && disableSkipping) {
|
if (disableSkipping != undefined && disableSkipping) {
|
||||||
@@ -403,10 +406,13 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
|
|||||||
PageElements.whitelistButton.classList.remove("hidden");
|
PageElements.whitelistButton.classList.remove("hidden");
|
||||||
PageElements.loadingIndicator.style.display = "none";
|
PageElements.loadingIndicator.style.display = "none";
|
||||||
|
|
||||||
|
downloadedTimes = request.sponsorTimes ?? [];
|
||||||
if (request.found) {
|
if (request.found) {
|
||||||
PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsorFound");
|
PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsorFound");
|
||||||
|
|
||||||
displayDownloadedSponsorTimes(request);
|
if (request.sponsorTimes) {
|
||||||
|
displayDownloadedSponsorTimes(request.sponsorTimes, request.time);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsor404");
|
PageElements.videoFound.innerHTML = chrome.i18n.getMessage("sponsor404");
|
||||||
}
|
}
|
||||||
@@ -477,203 +483,208 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//display the video times from the array at the top, in a different section
|
//display the video times from the array at the top, in a different section
|
||||||
function displayDownloadedSponsorTimes(request: { found: boolean, sponsorTimes: SponsorTime[] }) {
|
function displayDownloadedSponsorTimes(sponsorTimes: SponsorTime[], time: number) {
|
||||||
if (request.sponsorTimes != undefined) {
|
let currentSegmentTab = segmentTab;
|
||||||
let currentSegmentTab = segmentTab;
|
if (!sponsorTimes.some((segment) => segment.actionType === ActionType.Chapter)) {
|
||||||
if (!request.sponsorTimes.some((segment) => segment.actionType === ActionType.Chapter)) {
|
PageElements.issueReporterTabs.classList.add("hidden");
|
||||||
PageElements.issueReporterTabs.classList.add("hidden");
|
currentSegmentTab = SegmentTab.Segments;
|
||||||
currentSegmentTab = SegmentTab.Segments;
|
} else {
|
||||||
|
PageElements.issueReporterTabs.classList.remove("hidden");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sort list by start time
|
||||||
|
const downloadedTimes = sponsorTimes
|
||||||
|
.filter((segment) => {
|
||||||
|
if (currentSegmentTab === SegmentTab.Segments) {
|
||||||
|
return segment.actionType !== ActionType.Chapter;
|
||||||
|
} else if (currentSegmentTab === SegmentTab.Chapters) {
|
||||||
|
return segment.actionType === ActionType.Chapter
|
||||||
|
&& segment.source !== SponsorSourceType.YouTube;
|
||||||
|
} else {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.sort((a, b) => a.segment[1] - b.segment[1])
|
||||||
|
.sort((a, b) => a.segment[0] - b.segment[0]);
|
||||||
|
|
||||||
|
//add them as buttons to the issue reporting container
|
||||||
|
const container = document.getElementById("issueReporterTimeButtons");
|
||||||
|
while (container.firstChild) {
|
||||||
|
container.removeChild(container.firstChild);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (downloadedTimes.length > 0) {
|
||||||
|
PageElements.issueReporterImportExport.classList.remove("hidden");
|
||||||
|
if (utils.getCategorySelection("chapter")?.option === CategorySkipOption.ShowOverlay) {
|
||||||
|
PageElements.importSegmentsButton.classList.remove("hidden");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
PageElements.issueReporterImportExport.classList.add("hidden");
|
||||||
|
}
|
||||||
|
|
||||||
|
const isVip = Config.config.isVip;
|
||||||
|
for (let i = 0; i < downloadedTimes.length; i++) {
|
||||||
|
const UUID = downloadedTimes[i].UUID;
|
||||||
|
const locked = downloadedTimes[i].locked;
|
||||||
|
const category = downloadedTimes[i].category;
|
||||||
|
const actionType = downloadedTimes[i].actionType;
|
||||||
|
|
||||||
|
const segmentSummary = document.createElement("summary");
|
||||||
|
segmentSummary.classList.add("segmentSummary");
|
||||||
|
if (time >= downloadedTimes[i].segment[0]) {
|
||||||
|
if (time < downloadedTimes[i].segment[1]) {
|
||||||
|
segmentSummary.classList.add("segmentActive");
|
||||||
|
} else {
|
||||||
|
segmentSummary.classList.add("segmentPassed");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const categoryColorCircle = document.createElement("span");
|
||||||
|
categoryColorCircle.id = "sponsorTimesCategoryColorCircle" + UUID;
|
||||||
|
categoryColorCircle.style.backgroundColor = Config.config.barTypes[category]?.color;
|
||||||
|
categoryColorCircle.classList.add("dot");
|
||||||
|
categoryColorCircle.classList.add("sponsorTimesCategoryColorCircle");
|
||||||
|
|
||||||
|
let extraInfo = "";
|
||||||
|
if (downloadedTimes[i].hidden === SponsorHideType.Downvoted) {
|
||||||
|
//this one is downvoted
|
||||||
|
extraInfo = " (" + chrome.i18n.getMessage("hiddenDueToDownvote") + ")";
|
||||||
|
} else if (downloadedTimes[i].hidden === SponsorHideType.MinimumDuration) {
|
||||||
|
//this one is too short
|
||||||
|
extraInfo = " (" + chrome.i18n.getMessage("hiddenDueToDuration") + ")";
|
||||||
|
} else if (downloadedTimes[i].hidden === SponsorHideType.Hidden) {
|
||||||
|
extraInfo = " (" + chrome.i18n.getMessage("manuallyHidden") + ")";
|
||||||
|
}
|
||||||
|
|
||||||
|
const name = downloadedTimes[i].description || shortCategoryName(category);
|
||||||
|
const textNode = document.createTextNode(name + extraInfo);
|
||||||
|
const segmentTimeFromToNode = document.createElement("div");
|
||||||
|
if (downloadedTimes[i].actionType === ActionType.Full) {
|
||||||
|
segmentTimeFromToNode.innerText = chrome.i18n.getMessage("full");
|
||||||
} else {
|
} else {
|
||||||
PageElements.issueReporterTabs.classList.remove("hidden");
|
segmentTimeFromToNode.innerText = GenericUtils.getFormattedTime(downloadedTimes[i].segment[0], true) +
|
||||||
|
(actionType !== ActionType.Poi
|
||||||
|
? " " + chrome.i18n.getMessage("to") + " " + GenericUtils.getFormattedTime(downloadedTimes[i].segment[1], true)
|
||||||
|
: "");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sort list by start time
|
segmentTimeFromToNode.style.margin = "5px";
|
||||||
downloadedTimes = request.sponsorTimes
|
|
||||||
.filter((segment) => {
|
// for inline-styling purposes
|
||||||
if (currentSegmentTab === SegmentTab.Segments) {
|
const labelContainer = document.createElement("div");
|
||||||
return segment.actionType !== ActionType.Chapter;
|
if (actionType !== ActionType.Chapter) labelContainer.appendChild(categoryColorCircle);
|
||||||
} else if (currentSegmentTab === SegmentTab.Chapters) {
|
|
||||||
return segment.actionType === ActionType.Chapter
|
|
||||||
&& segment.source !== SponsorSourceType.YouTube;
|
|
||||||
} else {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.sort((a, b) => a.segment[1] - b.segment[1])
|
|
||||||
.sort((a, b) => a.segment[0] - b.segment[0]);
|
|
||||||
|
|
||||||
//add them as buttons to the issue reporting container
|
const span = document.createElement('span');
|
||||||
const container = document.getElementById("issueReporterTimeButtons");
|
span.className = "summaryLabel";
|
||||||
while (container.firstChild) {
|
span.appendChild(textNode);
|
||||||
container.removeChild(container.firstChild);
|
labelContainer.appendChild(span);
|
||||||
|
|
||||||
|
segmentSummary.appendChild(labelContainer);
|
||||||
|
segmentSummary.appendChild(segmentTimeFromToNode);
|
||||||
|
|
||||||
|
const votingButtons = document.createElement("details");
|
||||||
|
votingButtons.classList.add("votingButtons");
|
||||||
|
|
||||||
|
//thumbs up and down buttons
|
||||||
|
const voteButtonsContainer = document.createElement("div");
|
||||||
|
voteButtonsContainer.id = "sponsorTimesVoteButtonsContainer" + UUID;
|
||||||
|
voteButtonsContainer.classList.add("sbVoteButtonsContainer");
|
||||||
|
|
||||||
|
const upvoteButton = document.createElement("img");
|
||||||
|
upvoteButton.id = "sponsorTimesUpvoteButtonsContainer" + UUID;
|
||||||
|
upvoteButton.className = "voteButton";
|
||||||
|
upvoteButton.title = chrome.i18n.getMessage("upvote");
|
||||||
|
upvoteButton.src = chrome.runtime.getURL("icons/thumbs_up.svg");
|
||||||
|
upvoteButton.addEventListener("click", () => vote(1, UUID));
|
||||||
|
|
||||||
|
const downvoteButton = document.createElement("img");
|
||||||
|
downvoteButton.id = "sponsorTimesDownvoteButtonsContainer" + UUID;
|
||||||
|
downvoteButton.className = "voteButton";
|
||||||
|
downvoteButton.title = chrome.i18n.getMessage("downvote");
|
||||||
|
downvoteButton.src = locked && isVip ? chrome.runtime.getURL("icons/thumbs_down_locked.svg") : chrome.runtime.getURL("icons/thumbs_down.svg");
|
||||||
|
downvoteButton.addEventListener("click", () => vote(0, UUID));
|
||||||
|
|
||||||
|
const uuidButton = document.createElement("img");
|
||||||
|
uuidButton.id = "sponsorTimesCopyUUIDButtonContainer" + UUID;
|
||||||
|
uuidButton.className = "voteButton";
|
||||||
|
uuidButton.src = chrome.runtime.getURL("icons/clipboard.svg");
|
||||||
|
uuidButton.title = chrome.i18n.getMessage("copySegmentID");
|
||||||
|
uuidButton.addEventListener("click", () => {
|
||||||
|
copyToClipboard(UUID);
|
||||||
|
const stopAnimation = AnimationUtils.applyLoadingAnimation(uuidButton, 0.3);
|
||||||
|
stopAnimation();
|
||||||
|
});
|
||||||
|
|
||||||
|
const hideButton = document.createElement("img");
|
||||||
|
hideButton.id = "sponsorTimesCopyUUIDButtonContainer" + UUID;
|
||||||
|
hideButton.className = "voteButton";
|
||||||
|
hideButton.title = chrome.i18n.getMessage("hideSegment");
|
||||||
|
if (downloadedTimes[i].hidden === SponsorHideType.Hidden) {
|
||||||
|
hideButton.src = chrome.runtime.getURL("icons/not_visible.svg");
|
||||||
|
} else {
|
||||||
|
hideButton.src = chrome.runtime.getURL("icons/visible.svg");
|
||||||
}
|
}
|
||||||
|
hideButton.addEventListener("click", () => {
|
||||||
|
const stopAnimation = AnimationUtils.applyLoadingAnimation(hideButton, 0.4);
|
||||||
|
stopAnimation();
|
||||||
|
|
||||||
if (downloadedTimes.length > 0) {
|
|
||||||
PageElements.issueReporterImportExport.classList.remove("hidden");
|
|
||||||
if (utils.getCategorySelection("chapter")?.option === CategorySkipOption.ShowOverlay) {
|
|
||||||
PageElements.importSegmentsButton.classList.remove("hidden");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
PageElements.issueReporterImportExport.classList.add("hidden");
|
|
||||||
}
|
|
||||||
|
|
||||||
const isVip = Config.config.isVip;
|
|
||||||
for (let i = 0; i < downloadedTimes.length; i++) {
|
|
||||||
const UUID = downloadedTimes[i].UUID;
|
|
||||||
const locked = downloadedTimes[i].locked;
|
|
||||||
const category = downloadedTimes[i].category;
|
|
||||||
const actionType = downloadedTimes[i].actionType;
|
|
||||||
|
|
||||||
const segmentSummary = document.createElement("summary");
|
|
||||||
segmentSummary.className = "segmentSummary";
|
|
||||||
|
|
||||||
const categoryColorCircle = document.createElement("span");
|
|
||||||
categoryColorCircle.id = "sponsorTimesCategoryColorCircle" + UUID;
|
|
||||||
categoryColorCircle.style.backgroundColor = Config.config.barTypes[category]?.color;
|
|
||||||
categoryColorCircle.classList.add("dot");
|
|
||||||
categoryColorCircle.classList.add("sponsorTimesCategoryColorCircle");
|
|
||||||
|
|
||||||
let extraInfo = "";
|
|
||||||
if (downloadedTimes[i].hidden === SponsorHideType.Downvoted) {
|
|
||||||
//this one is downvoted
|
|
||||||
extraInfo = " (" + chrome.i18n.getMessage("hiddenDueToDownvote") + ")";
|
|
||||||
} else if (downloadedTimes[i].hidden === SponsorHideType.MinimumDuration) {
|
|
||||||
//this one is too short
|
|
||||||
extraInfo = " (" + chrome.i18n.getMessage("hiddenDueToDuration") + ")";
|
|
||||||
} else if (downloadedTimes[i].hidden === SponsorHideType.Hidden) {
|
|
||||||
extraInfo = " (" + chrome.i18n.getMessage("manuallyHidden") + ")";
|
|
||||||
}
|
|
||||||
|
|
||||||
const name = downloadedTimes[i].description || shortCategoryName(category);
|
|
||||||
const textNode = document.createTextNode(name + extraInfo);
|
|
||||||
const segmentTimeFromToNode = document.createElement("div");
|
|
||||||
if (downloadedTimes[i].actionType === ActionType.Full) {
|
|
||||||
segmentTimeFromToNode.innerText = chrome.i18n.getMessage("full");
|
|
||||||
} else {
|
|
||||||
segmentTimeFromToNode.innerText = GenericUtils.getFormattedTime(downloadedTimes[i].segment[0], true) +
|
|
||||||
(actionType !== ActionType.Poi
|
|
||||||
? " " + chrome.i18n.getMessage("to") + " " + GenericUtils.getFormattedTime(downloadedTimes[i].segment[1], true)
|
|
||||||
: "");
|
|
||||||
}
|
|
||||||
|
|
||||||
segmentTimeFromToNode.style.margin = "5px";
|
|
||||||
|
|
||||||
// for inline-styling purposes
|
|
||||||
const labelContainer = document.createElement("div");
|
|
||||||
if (actionType !== ActionType.Chapter) labelContainer.appendChild(categoryColorCircle);
|
|
||||||
|
|
||||||
const span = document.createElement('span');
|
|
||||||
span.className = "summaryLabel";
|
|
||||||
span.appendChild(textNode);
|
|
||||||
labelContainer.appendChild(span);
|
|
||||||
|
|
||||||
segmentSummary.appendChild(labelContainer);
|
|
||||||
segmentSummary.appendChild(segmentTimeFromToNode);
|
|
||||||
|
|
||||||
const votingButtons = document.createElement("details");
|
|
||||||
votingButtons.classList.add("votingButtons");
|
|
||||||
|
|
||||||
//thumbs up and down buttons
|
|
||||||
const voteButtonsContainer = document.createElement("div");
|
|
||||||
voteButtonsContainer.id = "sponsorTimesVoteButtonsContainer" + UUID;
|
|
||||||
voteButtonsContainer.classList.add("sbVoteButtonsContainer");
|
|
||||||
|
|
||||||
const upvoteButton = document.createElement("img");
|
|
||||||
upvoteButton.id = "sponsorTimesUpvoteButtonsContainer" + UUID;
|
|
||||||
upvoteButton.className = "voteButton";
|
|
||||||
upvoteButton.title = chrome.i18n.getMessage("upvote");
|
|
||||||
upvoteButton.src = chrome.runtime.getURL("icons/thumbs_up.svg");
|
|
||||||
upvoteButton.addEventListener("click", () => vote(1, UUID));
|
|
||||||
|
|
||||||
const downvoteButton = document.createElement("img");
|
|
||||||
downvoteButton.id = "sponsorTimesDownvoteButtonsContainer" + UUID;
|
|
||||||
downvoteButton.className = "voteButton";
|
|
||||||
downvoteButton.title = chrome.i18n.getMessage("downvote");
|
|
||||||
downvoteButton.src = locked && isVip ? chrome.runtime.getURL("icons/thumbs_down_locked.svg") : chrome.runtime.getURL("icons/thumbs_down.svg");
|
|
||||||
downvoteButton.addEventListener("click", () => vote(0, UUID));
|
|
||||||
|
|
||||||
const uuidButton = document.createElement("img");
|
|
||||||
uuidButton.id = "sponsorTimesCopyUUIDButtonContainer" + UUID;
|
|
||||||
uuidButton.className = "voteButton";
|
|
||||||
uuidButton.src = chrome.runtime.getURL("icons/clipboard.svg");
|
|
||||||
uuidButton.title = chrome.i18n.getMessage("copySegmentID");
|
|
||||||
uuidButton.addEventListener("click", () => {
|
|
||||||
copyToClipboard(UUID);
|
|
||||||
const stopAnimation = AnimationUtils.applyLoadingAnimation(uuidButton, 0.3);
|
|
||||||
stopAnimation();
|
|
||||||
});
|
|
||||||
|
|
||||||
const hideButton = document.createElement("img");
|
|
||||||
hideButton.id = "sponsorTimesCopyUUIDButtonContainer" + UUID;
|
|
||||||
hideButton.className = "voteButton";
|
|
||||||
hideButton.title = chrome.i18n.getMessage("hideSegment");
|
|
||||||
if (downloadedTimes[i].hidden === SponsorHideType.Hidden) {
|
if (downloadedTimes[i].hidden === SponsorHideType.Hidden) {
|
||||||
hideButton.src = chrome.runtime.getURL("icons/not_visible.svg");
|
|
||||||
} else {
|
|
||||||
hideButton.src = chrome.runtime.getURL("icons/visible.svg");
|
hideButton.src = chrome.runtime.getURL("icons/visible.svg");
|
||||||
|
downloadedTimes[i].hidden = SponsorHideType.Visible;
|
||||||
|
} else {
|
||||||
|
hideButton.src = chrome.runtime.getURL("icons/not_visible.svg");
|
||||||
|
downloadedTimes[i].hidden = SponsorHideType.Hidden;
|
||||||
}
|
}
|
||||||
hideButton.addEventListener("click", () => {
|
|
||||||
const stopAnimation = AnimationUtils.applyLoadingAnimation(hideButton, 0.4);
|
|
||||||
stopAnimation();
|
|
||||||
|
|
||||||
if (downloadedTimes[i].hidden === SponsorHideType.Hidden) {
|
messageHandler.query({
|
||||||
hideButton.src = chrome.runtime.getURL("icons/visible.svg");
|
active: true,
|
||||||
downloadedTimes[i].hidden = SponsorHideType.Visible;
|
currentWindow: true
|
||||||
} else {
|
}, tabs => {
|
||||||
hideButton.src = chrome.runtime.getURL("icons/not_visible.svg");
|
messageHandler.sendMessage(
|
||||||
downloadedTimes[i].hidden = SponsorHideType.Hidden;
|
tabs[0].id,
|
||||||
}
|
{
|
||||||
|
message: "hideSegment",
|
||||||
messageHandler.query({
|
type: downloadedTimes[i].hidden,
|
||||||
active: true,
|
UUID: UUID
|
||||||
currentWindow: true
|
}
|
||||||
}, tabs => {
|
);
|
||||||
messageHandler.sendMessage(
|
|
||||||
tabs[0].id,
|
|
||||||
{
|
|
||||||
message: "hideSegment",
|
|
||||||
type: downloadedTimes[i].hidden,
|
|
||||||
UUID: UUID
|
|
||||||
}
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
|
||||||
const skipButton = document.createElement("img");
|
const skipButton = document.createElement("img");
|
||||||
skipButton.id = "sponsorTimesSkipButtonContainer" + UUID;
|
skipButton.id = "sponsorTimesSkipButtonContainer" + UUID;
|
||||||
skipButton.className = "voteButton";
|
skipButton.className = "voteButton";
|
||||||
skipButton.src = chrome.runtime.getURL("icons/skip.svg");
|
skipButton.src = chrome.runtime.getURL("icons/skip.svg");
|
||||||
skipButton.addEventListener("click", () => skipSegment(actionType, UUID, skipButton));
|
skipButton.addEventListener("click", () => skipSegment(actionType, UUID, skipButton));
|
||||||
container.addEventListener("dblclick", () => skipSegment(actionType, UUID));
|
container.addEventListener("dblclick", () => skipSegment(actionType, UUID));
|
||||||
|
|
||||||
//add thumbs up, thumbs down and uuid copy buttons to the container
|
//add thumbs up, thumbs down and uuid copy buttons to the container
|
||||||
voteButtonsContainer.appendChild(upvoteButton);
|
voteButtonsContainer.appendChild(upvoteButton);
|
||||||
voteButtonsContainer.appendChild(downvoteButton);
|
voteButtonsContainer.appendChild(downvoteButton);
|
||||||
voteButtonsContainer.appendChild(uuidButton);
|
voteButtonsContainer.appendChild(uuidButton);
|
||||||
if (downloadedTimes[i].actionType === ActionType.Skip
|
if (downloadedTimes[i].actionType === ActionType.Skip
|
||||||
&& [SponsorHideType.Visible, SponsorHideType.Hidden].includes(downloadedTimes[i].hidden)) {
|
&& [SponsorHideType.Visible, SponsorHideType.Hidden].includes(downloadedTimes[i].hidden)) {
|
||||||
voteButtonsContainer.appendChild(hideButton);
|
voteButtonsContainer.appendChild(hideButton);
|
||||||
}
|
|
||||||
voteButtonsContainer.appendChild(skipButton);
|
|
||||||
|
|
||||||
|
|
||||||
// Will contain request status
|
|
||||||
const voteStatusContainer = document.createElement("div");
|
|
||||||
voteStatusContainer.id = "sponsorTimesVoteStatusContainer" + UUID;
|
|
||||||
voteStatusContainer.classList.add("sponsorTimesVoteStatusContainer");
|
|
||||||
voteStatusContainer.style.display = "none";
|
|
||||||
|
|
||||||
const thanksForVotingText = document.createElement("div");
|
|
||||||
thanksForVotingText.id = "sponsorTimesThanksForVotingText" + UUID;
|
|
||||||
thanksForVotingText.classList.add("sponsorTimesThanksForVotingText");
|
|
||||||
voteStatusContainer.appendChild(thanksForVotingText);
|
|
||||||
|
|
||||||
votingButtons.append(segmentSummary);
|
|
||||||
votingButtons.append(voteButtonsContainer);
|
|
||||||
votingButtons.append(voteStatusContainer);
|
|
||||||
|
|
||||||
container.appendChild(votingButtons);
|
|
||||||
}
|
}
|
||||||
|
voteButtonsContainer.appendChild(skipButton);
|
||||||
|
|
||||||
|
|
||||||
|
// Will contain request status
|
||||||
|
const voteStatusContainer = document.createElement("div");
|
||||||
|
voteStatusContainer.id = "sponsorTimesVoteStatusContainer" + UUID;
|
||||||
|
voteStatusContainer.classList.add("sponsorTimesVoteStatusContainer");
|
||||||
|
voteStatusContainer.style.display = "none";
|
||||||
|
|
||||||
|
const thanksForVotingText = document.createElement("div");
|
||||||
|
thanksForVotingText.id = "sponsorTimesThanksForVotingText" + UUID;
|
||||||
|
thanksForVotingText.classList.add("sponsorTimesThanksForVotingText");
|
||||||
|
voteStatusContainer.appendChild(thanksForVotingText);
|
||||||
|
|
||||||
|
votingButtons.append(segmentSummary);
|
||||||
|
votingButtons.append(voteButtonsContainer);
|
||||||
|
votingButtons.append(voteStatusContainer);
|
||||||
|
|
||||||
|
container.appendChild(votingButtons);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1076,6 +1087,20 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function setupComPort(): void {
|
||||||
|
port = chrome.runtime.connect({ name: "popup" });
|
||||||
|
port.onDisconnect.addListener(() => setupComPort());
|
||||||
|
port.onMessage.addListener((msg) => onMessage(msg));
|
||||||
|
}
|
||||||
|
|
||||||
|
function onMessage(msg: PopupMessage) {
|
||||||
|
switch (msg.message) {
|
||||||
|
case "time":
|
||||||
|
displayDownloadedSponsorTimes(downloadedTimes, msg.time);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
runThePopup();
|
runThePopup();
|
||||||
|
|||||||
Reference in New Issue
Block a user