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

# Conflicts:
#	public/_locales/en/messages.json
#	src/config.ts
This commit is contained in:
Ajay Ramachandran
2020-02-08 22:19:07 -05:00
6 changed files with 132 additions and 20 deletions

View File

@@ -1,4 +1,3 @@
import * as CompileConfig from "../config.json";
import Config from "./config";
class Utils {
@@ -241,7 +240,7 @@ class Utils {
sendRequestToServer(type: string, address: string, callback?: (xmlhttp: XMLHttpRequest, err: boolean) => any) {
let xmlhttp = new XMLHttpRequest();
xmlhttp.open(type, CompileConfig.serverAddress + address, true);
xmlhttp.open(type, Config.config.serverAddress + address, true);
if (callback != undefined) {
xmlhttp.onreadystatechange = function () {