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

Improved icon handling and download

Browse source
This commit is contained in:
WolverinDEV 2019-06-26 14:06:20 +02:00
parent c74206dfb7
commit c5468b5e3b
4 changed files with 48 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
shared/css/static/modal-icons.scss
View file

@ -161,6 +161,8 @@
flex-direction: column;
.container-select {
min-height: 130px;
display: flex;
flex-direction: row;
justify-content: stretch;
@ -171,7 +173,8 @@
width: min-content;
min-width: 150px;
min-height: 200px;
min-height: 130px;
overflow-y: auto;
margin-right: 5px;
@ -226,6 +229,9 @@
}
.container-upload {
display: flex;
flex-direction: column;
margin-top: 5px;
border-top: 1px solid darkgray;
padding-top: 5px;
@ -247,6 +253,7 @@
.container-success {
margin-top: 5px;
min-height: 100px;
}
.container-info {
@ -259,6 +266,8 @@
width: 100%;
min-height: 100px;
overflow-y: auto;
border: gray solid 1px;
border-radius: 2px;

30
shared/js/FileManager.ts
View file

@ -84,8 +84,10 @@ class RequestFileDownload implements transfer.DownloadTransfer {
'Access-Control-Expose-Headers': '*'
}
});
if(!response.ok)
if(!response.ok) {
debugger;
throw (response.type == 'opaque' || response.type == 'opaqueredirect' ? "invalid cross origin flag! May target isn't a TeaSpeak server?" : response.statusText || "response is not ok");
}
return response;
}
@ -449,6 +451,22 @@ class CacheManager {
setupped() : boolean { return !!this._cache_category; }
async reset() {
if(!window.caches)
return;
try {
await caches.delete(this.cache_name);
} catch(error) {
throw "Failed to delete cache: " + error;
}
try {
await this.setup();
} catch(error) {
throw "Failed to reinitialize cache!";
}
}
async setup() {
if(!window.caches)
throw "Missing caches!";
@ -503,6 +521,16 @@ class IconManager {
IconManager.cache = new CacheManager("icons");
}
async clear_cache() {
await IconManager.cache.reset();
if(URL.revokeObjectURL) {
for(const id of Object.keys(this._id_urls))
URL.revokeObjectURL(this._id_urls[id]);
}
this._id_urls = {};
this._loading_promises = {};
}
async delete_icon(id: number) : Promise<void> {
if(id <= 1000)
throw "invalid id!";

5
shared/js/settings.ts
View file

@ -135,6 +135,11 @@ class StaticSettings extends SettingsBase {
}
class Settings extends StaticSettings {
static readonly KEY_DISABLE_COSMETIC_SLOWDOWN: SettingsKey<boolean> = {
key: 'disable_cosmetic_slowdown',
description: 'Disable the cosmetic slowdows in some processes, like icon upload.'
};
static readonly KEY_DISABLE_CONTEXT_MENU: SettingsKey<boolean> = {
key: 'disableContextMenu',
description: 'Disable the context menu for the channel tree which allows to debug the DOM easier'

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

@ -384,7 +384,8 @@ namespace Modals {
})
} catch(error) {
if(error instanceof CommandResult && error.id == ErrorID.FILE_ALREADY_EXISTS) {
await new Promise(resolve => setTimeout(resolve, 500 + Math.floor(Math.random() * 500)));
if(!settings.static_global(Settings.KEY_DISABLE_COSMETIC_SLOWDOWN, false))
await new Promise(resolve => setTimeout(resolve, 500 + Math.floor(Math.random() * 500)));
bar.set_message(tr("icon already exists"));
bar.set_value(100);
icon.upload_state = "uploaded";
@ -412,7 +413,8 @@ namespace Modals {
}
const time_end = Date.now();
await new Promise(resolve => setTimeout(resolve, Math.max(0, 1000 - (time_end - time_begin))));
if(!settings.static_global(Settings.KEY_DISABLE_COSMETIC_SLOWDOWN, false))
await new Promise(resolve => setTimeout(resolve, Math.max(0, 1000 - (time_end - time_begin))));
bar.set_value(100);
bar.set_message(tr("upload completed"));
icon.upload_state = "uploaded";