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

Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into chapters

Browse Source
This commit is contained in:
Ajay
2022-09-01 15:21:23 -04:00
parent c6e30236e9 f05d081cd6
commit 3e40745621
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/popup.css
View File

@@ -100,6 +100,10 @@
margin-bottom: 16px; margin-bottom: 16px;
} }
#sponsorBlockPopupContainer iframe {
width: 100%;
}
/* /*
* Disable popup max height when displayed in-page (content.ts) * Disable popup max height when displayed in-page (content.ts)
*/ */
@@ -110,7 +114,7 @@
/* /*
* Disable fixed popup width when displayed in-page (content.ts) * Disable fixed popup width when displayed in-page (content.ts)
*/ */
#sponsorBlockPopupContainer #sponsorBlockPopupBody { #sponsorBlockPopupBody.is-embedded {
width: auto; width: auto;
} }

4
src/popup.ts
View File

@@ -86,6 +86,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
const PageElements: PageElements = {}; const PageElements: PageElements = {};
[ [
"sponsorBlockPopupBody",
"sponsorblockPopup", "sponsorblockPopup",
"sponsorStart", "sponsorStart",
// Top toggles // Top toggles
@@ -153,7 +154,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
getSegmentsFromContentScript(false); getSegmentsFromContentScript(false);
await utils.wait(() => Config.config !== null && allowPopup, 5000, 5); await utils.wait(() => Config.config !== null && allowPopup, 5000, 5);
document.querySelector("body").style.removeProperty("visibility"); PageElements.sponsorBlockPopupBody.style.removeProperty("visibility");
if (!Config.configSyncListeners.includes(contentConfigUpdateListener)) { if (!Config.configSyncListeners.includes(contentConfigUpdateListener)) {
Config.configSyncListeners.push(contentConfigUpdateListener); Config.configSyncListeners.push(contentConfigUpdateListener);
} }
@@ -166,6 +167,7 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
if (window !== window.top) { if (window !== window.top) {
PageElements.sbCloseButton.classList.remove("hidden"); PageElements.sbCloseButton.classList.remove("hidden");
PageElements.sponsorBlockPopupBody.classList.add("is-embedded");
} }
// Hide donate button if wanted (Safari, or user choice) // Hide donate button if wanted (Safari, or user choice)

2
src/utils/genericUtils.ts
View File

@@ -72,7 +72,7 @@ function getFormattedTime(seconds: number, precise?: boolean): string {
* @returns {string} errorMessage * @returns {string} errorMessage
*/ */
function getErrorMessage(statusCode: number, responseText: string): string { function getErrorMessage(statusCode: number, responseText: string): string {
const postFix = ((responseText && !responseText.includes(`cf-wrapper`)) ? "\n\n" + responseText : ""); const postFix = ((responseText && !(responseText.includes(`cf-wrapper`) || responseText.includes("<!DOCTYPE html>"))) ? "\n\n" + responseText : "");
// display response body for 4xx // display response body for 4xx
if([400, 429, 409, 0].includes(statusCode)) { if([400, 429, 409, 0].includes(statusCode)) {
return chrome.i18n.getMessage(statusCode + "") + " " + chrome.i18n.getMessage("errorCode") + statusCode + postFix; return chrome.i18n.getMessage(statusCode + "") + " " + chrome.i18n.getMessage("errorCode") + statusCode + postFix;