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

Fix merge issues

Browse Source
This commit is contained in:
Ajay Ramachandran
2020-01-09 19:19:30 -05:00
parent 0481943737
commit d705610855
1 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
options/options.js
View File

@@ -251,13 +251,9 @@ function activateTextChange(element) {
let textBox = element.querySelector(".option-text-box"); let textBox = element.querySelector(".option-text-box");
let option = element.getAttribute("sync-option"); let option = element.getAttribute("sync-option");
textBox.value = SB.config[option];
<<<<<<< HEAD
// See if anything extra must be done // See if anything extra must be done
switch (option) { switch (option) {
case "invidiousInstances": case "invidiousInstances":
let setButton = element.querySelector(".text-change-set"); let setButton = element.querySelector(".text-change-set");
setButton.addEventListener("click", async function(e) { setButton.addEventListener("click", async function(e) {
if (textBox.value.includes("/") || textBox.value.includes("http") || textBox.value.includes(":")) { if (textBox.value.includes("/") || textBox.value.includes("http") || textBox.value.includes(":")) {
@@ -303,29 +299,10 @@ function activateTextChange(element) {
return; return;
} }
chrome.storage.sync.get([option], function(result) { textBox.value = SB.config[option];
textBox.value = result[option];
let setButton = element.querySelector(".text-change-set");
setButton.addEventListener("click", (e) => setOptionValue(option, textBox.value));
element.querySelector(".option-hidden-section").classList.remove("hidden");
});
}
/**
* Called when an option has been changed.
*
* @param {string} option
* @param {*} value
*/
function setOptionValue(option, value, callback) {
chrome.storage.sync.set({[option]: value}, callback);
}
=======
let setButton = element.querySelector(".text-change-set"); let setButton = element.querySelector(".text-change-set");
setButton.addEventListener("click", () => {SB.config[option] = textBox.value}); setButton.addEventListener("click", () => {SB.config[option] = textBox.value});
element.querySelector(".option-hidden-section").classList.remove("hidden"); element.querySelector(".option-hidden-section").classList.remove("hidden");
} }
>>>>>>> c53bc202941f8dbf2f5481a891ca28a69825304b