mirror of
https://github.com/ajayyy/SponsorBlock.git
synced 2024-11-10 01:01:55 +01:00
Change the way server address defaults are handled.
This commit is contained in:
parent
62653705ff
commit
6f03c68fdc
3 changed files with 5 additions and 12 deletions
|
@ -1,3 +1,5 @@
|
|||
import * as CompileConfig from "../config.json";
|
||||
|
||||
interface SBConfig {
|
||||
userID: string,
|
||||
sponsorTimes: SBMap<string, any>,
|
||||
|
@ -20,7 +22,7 @@ interface SBConfig {
|
|||
invidiousUpdateInfoShowCount: number,
|
||||
autoUpvote: boolean,
|
||||
supportInvidious: false,
|
||||
customServerAddress: string,
|
||||
serverAddress: string,
|
||||
minDuration: number
|
||||
}
|
||||
|
||||
|
@ -114,7 +116,7 @@ var Config: SBObject = {
|
|||
invidiousUpdateInfoShowCount: 0,
|
||||
autoUpvote: true,
|
||||
supportInvidious: false,
|
||||
customServerAddress: null,
|
||||
serverAddress: CompileConfig.serverAddress,
|
||||
minDuration: 0
|
||||
},
|
||||
localConfig: null,
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
import Config from "./config";
|
||||
import * as CompileConfig from "../config.json";
|
||||
|
||||
import Utils from "./utils";
|
||||
var utils = new Utils();
|
||||
|
@ -73,11 +72,6 @@ async function init() {
|
|||
let saveButton = <HTMLElement> optionsElements[i].querySelector(".option-button");
|
||||
|
||||
stringInput.value = Config.config[stringChangeOption];
|
||||
// Devs can use config.json to set server address
|
||||
if (stringChangeOption === "customServerAddress") {
|
||||
stringInput.value = (Config.config.customServerAddress) ? Config.config.customServerAddress : CompileConfig.serverAddress;
|
||||
}
|
||||
|
||||
|
||||
saveButton.addEventListener("click", () => {
|
||||
setStringConfigOption(stringInput.value, stringChangeOption);
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import * as CompileConfig from "../config.json";
|
||||
import Config from "./config";
|
||||
|
||||
class Utils {
|
||||
|
@ -240,9 +239,7 @@ class Utils {
|
|||
sendRequestToServer(type: string, address: string, callback?: (xmlhttp: XMLHttpRequest, err: boolean) => any) {
|
||||
let xmlhttp = new XMLHttpRequest();
|
||||
|
||||
let serverAddress = (Config.config.customServerAddress) ? Config.config.customServerAddress : CompileConfig.serverAddress;
|
||||
|
||||
xmlhttp.open(type, serverAddress + address, true);
|
||||
xmlhttp.open(type, Config.config.serverAddress + address, true);
|
||||
|
||||
if (callback != undefined) {
|
||||
xmlhttp.onreadystatechange = function () {
|
||||
|
|
Loading…
Reference in a new issue