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

Kinda fixed the cert accept popout (Which is not needed anymore)

Browse source
This commit is contained in:
WolverinDEV 2020-07-20 19:36:30 +02:00
parent 8ca9a8594f
commit 9b564991c8
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
loader/app/targets/certaccept.ts
View file

@ -24,10 +24,10 @@ const loader_javascript = {
}, },
load_scripts: async () => { load_scripts: async () => {
await loader.load_script(["vendor/jquery/jquery.min.js"]); await loader.scripts.load_multiple(["vendor/jquery/jquery.min.js"], {});
await loader.load_scripts([ await loader.scripts.load_multiple([
["dist/certificate-popup.js"], ["dist/certificate-popup.js"],
]); ], {});
} }
}; };
@ -41,15 +41,15 @@ const loader_style = {
}, },
load_style_debug: async () => { load_style_debug: async () => {
await loader.load_styles([ await loader.style.load_multiple([
"css/static/main.css", "css/static/main.css",
]); ], {});
}, },
load_style_release: async () => { load_style_release: async () => {
await loader.load_styles([ await loader.style.load_multiple([
"css/static/main.css", "css/static/main.css",
]); ], {});
} }
}; };
@ -93,3 +93,5 @@ if(!loader.running()) {
/* we know that we want to load the app */ /* we know that we want to load the app */
loader.execute_managed(); loader.execute_managed();
} }
export = {};

4
shared/popup/certaccept/js/main.ts
View file

@ -2,7 +2,7 @@ import {settings, Settings} from "tc-shared/settings";
import * as loader from "tc-loader"; import * as loader from "tc-loader";
import * as log from "tc-shared/log"; import * as log from "tc-shared/log";
import {LogCategory} from "tc-shared/log"; import {LogCategory} from "tc-shared/log";
import * as bipc from "tc-shared/BrowserIPC"; import * as bipc from "tc-shared/ipc/BrowserIPC";
const is_debug = false; //TODO: Sync with loader! const is_debug = false; //TODO: Sync with loader!
function tr(text: string) { return text; } function tr(text: string) { return text; }
@ -20,7 +20,7 @@ loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
log.info(LogCategory.IPC, tr("Using this instance as certificate callback. ID: %s"), certificate_accept); log.info(LogCategory.IPC, tr("Using this instance as certificate callback. ID: %s"), certificate_accept);
try { try {
await bipc.get_handler().post_certificate_accpected(certificate_accept); await bipc.getInstance().post_certificate_accpected(certificate_accept);
log.info(LogCategory.IPC, tr("Other instance has acknowledged out work. Closing this window.")); log.info(LogCategory.IPC, tr("Other instance has acknowledged out work. Closing this window."));
let seconds = 5; let seconds = 5;