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

Improved file transfer error handling

Browse source
This commit is contained in:
WolverinDEV 2019-10-26 01:39:59 +02:00
parent 7a2693c368
commit 3e73fe49ba
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
shared/js/ui/modal/ModalIconSelect.ts
View file

@ -322,8 +322,10 @@ namespace Modals {
html_tag: html.append(indicator).append(message), html_tag: html.append(indicator).append(message),
set_value: set_value, set_value: set_value,
set_message: msg => message.text(msg), set_message: msg => message.text(msg),
set_error: msg => { set_error: (msg: string) => {
message.text(tr("error: ") + msg); let index = msg.lastIndexOf(':');
message.text(index == -1 ? msg : msg.substring(index + 1));
message.attr('title', msg);
set_value(100); set_value(100);
indicator.removeClass("bg-success").addClass("bg-danger"); indicator.removeClass("bg-success").addClass("bg-danger");
} }
@ -412,6 +414,8 @@ namespace Modals {
console.error(tr("Icon upload failed for icon %s: %o"), icon.file.name, error); console.error(tr("Icon upload failed for icon %s: %o"), icon.file.name, error);
if(typeof(error) === "string") if(typeof(error) === "string")
bar.set_error(tr("upload failed: ") + error); bar.set_error(tr("upload failed: ") + error);
else if(typeof(error.message) === "string")
bar.set_error(tr("upload failed: ") + error.message);
else else
bar.set_error(tr("upload failed")); bar.set_error(tr("upload failed"));
icon.upload_state = "error"; icon.upload_state = "error";