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

Added firefox support and support for multiple invidious instances.

Browse Source
This commit is contained in:
Ajay Ramachandran
2019-12-31 17:48:43 -05:00
parent b0e0c380dd
commit b441cc2123
3 changed files with 85 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
options/options.js
View File

@@ -1,5 +1,10 @@
window.addEventListener('DOMContentLoaded', init);
var invidiousInstancesRegex = [];
for (const url of supportedInvidiousInstances) {
invidiousInstancesRegex.push("*://*." + url + "/*");
}
async function init() {
localizeHtmlPage();
@@ -65,7 +70,7 @@ async function init() {
}
// Don't wait on chrome
if (typeof(browser) == "undefined") {
if (isFirefox()) {
await wait(() => checksLeft == 0, 1000, 50);
}
@@ -80,9 +85,12 @@ async function init() {
* @param {string} option
*/
function invidiousInit(checkbox, option) {
let permissions = ["declarativeContent"];
if (isFirefox()) permissions = [];
chrome.permissions.contains({
origins: ["https://*.invidio.us/*", "https://*.invidiou.sh/*"],
permissions: ["declarativeContent"]
origins: invidiousInstancesRegex,
permissions: permissions
}, function (result) {
if (result != checkbox.checked) {
setOptionValue(option, result);
@@ -101,43 +109,66 @@ function invidiousInit(checkbox, option) {
function invidiousOnClick(checkbox, option) {
if (checkbox.checked) {
// Request permission
let permissions = ["declarativeContent"];
if (isFirefox()) permissions = [];
chrome.permissions.request({
origins: ["https://*.invidio.us/*", "https://*.invidiou.sh/*"],
permissions: ["declarativeContent"]
}, function (granted) {
origins: invidiousInstancesRegex,
permissions: permissions
}, async function (granted) {
if (granted) {
chrome.declarativeContent.onPageChanged.removeRules(["invidious"], function() {
// Add page rule
let rule = {
id: "invidious",
conditions: [
new chrome.declarativeContent.PageStateMatcher({
pageUrl: { urlMatches: "https://*.invidio.us/*" }
}),
new chrome.declarativeContent.PageStateMatcher({
pageUrl: { urlMatches: "https://*.invidiou.sh/*" }
})
],
actions: [new chrome.declarativeContent.RequestContentScript({
allFrames: true,
js: [
"config.js",
"utils/previewBar.js",
"utils/skipNotice.js",
"utils.js",
"content.js",
"popup.js"
],
css: [
"content.css",
"./libs/Source+Sans+Pro.css",
"popup.css"
]
})]
};
chrome.declarativeContent.onPageChanged.addRules([rule]);
});
let js = [
"config.js",
"utils/previewBar.js",
"utils/skipNotice.js",
"utils.js",
"content.js",
"popup.js"
];
let css = [
"content.css",
"./libs/Source+Sans+Pro.css",
"popup.css"
];
if (isFirefox()) {
let firefoxJS = [];
for (const file of js) {
firefoxJS.push({file});
}
let firefoxCSS = [];
for (const file of css) {
firefoxCSS.push({file});
}
let registration = await browser.contentScripts.register({
allFrames: true,
js: firefoxJS,
css: firefoxCSS,
matches: invidiousInstancesRegex
});
} else {
chrome.declarativeContent.onPageChanged.removeRules(["invidious"], function() {
let conditions = [];
for (const regex of invidiousInstancesRegex) {
conditions.push(new chrome.declarativeContent.PageStateMatcher({
pageUrl: { urlMatches: regex }
}));
}
// Add page rule
let rule = {
id: "invidious",
conditions,
actions: [new chrome.declarativeContent.RequestContentScript({
allFrames: true,
js,
css
})]
};
chrome.declarativeContent.onPageChanged.addRules([rule]);
});
}
} else {
setOptionValue(option, false);
checkbox.checked = false;
@@ -146,9 +177,14 @@ function invidiousOnClick(checkbox, option) {
}
});
} else {
chrome.declarativeContent.onPageChanged.removeRules(["invidious"]);
if (isFirefox()) {
// Nothing for now
} else {
chrome.declarativeContent.onPageChanged.removeRules(["invidious"]);
}
chrome.permissions.remove({
origins: ["https://*.invidio.us/*"]
origins: invidiousInstancesRegex
});
}
}