TeaSpeak
/
TeaWeb
1
0
Fork 0
Code Issues 1 Pull Requests Activity

fixed url

canary
WolverinDEV 2019-02-09 21:45:55 +01:00
parent 4835e6e9e8
commit b61d210eb7
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
shared/js/load.ts
View File

@ -292,12 +292,12 @@ namespace loader {
if(rule.cssText.indexOf("%%base_path%%") != -1) { if(rule.cssText.indexOf("%%base_path%%") != -1) {
rules_remove.push(index); rules_remove.push(index);
rules_add.push(rule_text.replace("%%base_path%%", document.location.href)); rules_add.push(rule_text.replace("%%base_path%%", document.location.origin + document.location.pathname));
} }
} }
for(const index of rules_remove.sort((a, b) => b > a ? 1 : 0)) for(const index of rules_remove.sort((a, b) => b > a ? 1 : 0))
css.removeRule(index); css.deleteRule(index);
for(const rule of rules_add) for(const rule of rules_add)
css.insertRule(rule); css.insertRule(rule);
} }
@ -774,7 +774,6 @@ loader.register_task(loader.Stage.INITIALIZING, {
priority: 20 priority: 20
}); });
loader.register_task(loader.Stage.INITIALIZING, { loader.register_task(loader.Stage.INITIALIZING, {
name: "app type test", name: "app type test",
function: loader_javascript.detect_type, function: loader_javascript.detect_type,
@ -808,6 +807,17 @@ loader.register_task(loader.Stage.LOADED, {
priority: 10 priority: 10
}); });
loader.register_task(loader.Stage.LOADED, {
name: "error task",
function: async () => {
if(Settings.instance.static("dummy_load_error", false)) {
displayCriticalError("The tea is cold!");
throw "The tea is cold!";
}
},
priority: 20
});
loader.execute().then(() => { loader.execute().then(() => {
console.log("app successfully loaded!"); console.log("app successfully loaded!");
}).catch(error => { }).catch(error => {