Mirror/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2025-12-06 19:47:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix close button layout issues

Browse Source
This commit is contained in:
Ajay
2022-06-02 16:56:19 -04:00
parent bfadb1373a
commit 5820758563
4 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/popup.html
View File

@@ -11,6 +11,10 @@
<body id="sponsorBlockPopupBody"> <body id="sponsorBlockPopupBody">
<div id="sponsorblockPopup" class="sponsorBlockPageBody sb-preload"> <div id="sponsorblockPopup" class="sponsorBlockPageBody sb-preload">
<button id="sbCloseButton" title="__MSG_closePopup__" class="sbCloseButton">
<img src="icons/close.png" width="15" height="15">
</button>
<div id="sbBetaServerWarning" class="hidden" title="__MSG_openOptionsPage__"> <div id="sbBetaServerWarning" class="hidden" title="__MSG_openOptionsPage__">
__MSG_betaServerWarning__ __MSG_betaServerWarning__
</div> </div>

22
src/content.ts
View File

@@ -217,6 +217,9 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
utils.addHiddenSegment(sponsorVideoID, request.UUID, request.type); utils.addHiddenSegment(sponsorVideoID, request.UUID, request.type);
updatePreviewBar(); updatePreviewBar();
break; break;
case "closePopup":
closeInfoMenu();
break;
} }
} }
@@ -1689,26 +1692,11 @@ function openInfoMenu() {
popup.id = "sponsorBlockPopupContainer"; popup.id = "sponsorBlockPopupContainer";
const frame = document.createElement("iframe"); const frame = document.createElement("iframe");
frame.width = "410"; frame.width = "374";
frame.height = "400"; frame.height = "500";
frame.onload = () => frame.contentWindow.postMessage("", "*"); frame.onload = () => frame.contentWindow.postMessage("", "*");
frame.src = chrome.extension.getURL("popup.html"); frame.src = chrome.extension.getURL("popup.html");
popup.appendChild(frame); popup.appendChild(frame);
//close button
const closeButton = document.createElement("button");
const closeButtonIcon = document.createElement("img");
closeButtonIcon.src = chrome.extension.getURL("icons/close.png");
closeButtonIcon.width = 15;
closeButtonIcon.height = 15;
closeButton.appendChild(closeButtonIcon);
closeButton.setAttribute("title", chrome.i18n.getMessage("closePopup"));
closeButton.classList.add("sbCloseButton");
closeButton.addEventListener("click", closeInfoMenu);
//add the close button
popup.prepend(closeButton);
const parentNodes = document.querySelectorAll("#secondary"); const parentNodes = document.querySelectorAll("#secondary");
let parentNode = null; let parentNode = null;

3
src/messageTypes.ts
View File

@@ -16,7 +16,8 @@ interface DefaultMessage {
| "getChannelID" | "getChannelID"
| "isChannelWhitelisted" | "isChannelWhitelisted"
| "submitTimes" | "submitTimes"
| "refreshSegments"; | "refreshSegments"
| "closePopup";
} }
interface BoolValueMessage { interface BoolValueMessage {

25
src/popup.ts
View File

@@ -122,9 +122,16 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
"sponsorTimesDonateContainer", "sponsorTimesDonateContainer",
"sbConsiderDonateLink", "sbConsiderDonateLink",
"sbCloseDonate", "sbCloseDonate",
"sbBetaServerWarning" "sbBetaServerWarning",
"sbCloseButton"
].forEach(id => PageElements[id] = document.getElementById(id)); ].forEach(id => PageElements[id] = document.getElementById(id));
PageElements.sbCloseButton.addEventListener("click", () => {
sendTabMessage({
message: "closePopup"
});
});
// Hide donate button if wanted (Safari, or user choice) // Hide donate button if wanted (Safari, or user choice)
if (!showDonationLink()) { if (!showDonationLink()) {
PageElements.sbDonate.style.display = "none"; PageElements.sbDonate.style.display = "none";
@@ -588,6 +595,22 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
chrome.runtime.sendMessage({ "message": "openHelp" }); chrome.runtime.sendMessage({ "message": "openHelp" });
} }
function sendTabMessage(data: Message): Promise<unknown> {
return new Promise((resolve) => {
messageHandler.query({
active: true,
currentWindow: true
}, tabs => {
messageHandler.sendMessage(
tabs[0].id,
data,
(response) => resolve(response)
);
}
);
});
}
//make the options username setting option visible //make the options username setting option visible
function setUsernameButton() { function setUsernameButton() {
PageElements.usernameInput.value = PageElements.usernameValue.innerText; PageElements.usernameInput.value = PageElements.usernameValue.innerText;