From 0007d770a95af4e83b3cfb8f4f57bb186256b7f0 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Thu, 7 May 2020 22:33:01 +0200 Subject: [PATCH] Fixed some minor import issues --- shared/js/file/FileManager.tsx | 2 +- shared/js/ui/modal/ModalAvatarList.ts | 2 +- shared/js/ui/modal/ModalBookmarks.ts | 2 +- shared/js/ui/modal/ModalConnect.ts | 2 +- shared/js/ui/modal/ModalIconSelect.ts | 5 +++-- shared/js/ui/modal/permission/HTMLPermissionEditor.ts | 2 +- shared/js/ui/tree/View.tsx | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/shared/js/file/FileManager.tsx b/shared/js/file/FileManager.tsx index 0324f58b..84310e08 100644 --- a/shared/js/file/FileManager.tsx +++ b/shared/js/file/FileManager.tsx @@ -3,7 +3,7 @@ import {LogCategory} from "tc-shared/log"; import {ChannelEntry} from "tc-shared/ui/channel"; import {ConnectionHandler} from "tc-shared/ConnectionHandler"; import {ServerCommand} from "tc-shared/connection/ConnectionBase"; -import {CommandResult, ErrorID} from "tc-shared/connection/ServerConnectionDeclaration"; +import {CommandResult} from "tc-shared/connection/ServerConnectionDeclaration"; import {AbstractCommandHandler} from "tc-shared/connection/AbstractCommandHandler"; import {IconManager} from "tc-shared/file/Icons"; import {AvatarManager} from "tc-shared/file/Avatars"; diff --git a/shared/js/ui/modal/ModalAvatarList.ts b/shared/js/ui/modal/ModalAvatarList.ts index c072561e..7320808e 100644 --- a/shared/js/ui/modal/ModalAvatarList.ts +++ b/shared/js/ui/modal/ModalAvatarList.ts @@ -2,11 +2,11 @@ import {createErrorModal, createModal} from "tc-shared/ui/elements/Modal"; import {LogCategory} from "tc-shared/log"; import {ConnectionHandler} from "tc-shared/ConnectionHandler"; import {base64_encode_ab} from "tc-shared/utils/buffers"; -import {media_image_type} from "tc-shared/file/FileManager"; import {spawnYesNo} from "tc-shared/ui/modal/ModalYesNo"; import {ClientEntry} from "tc-shared/ui/client"; import * as log from "tc-shared/log"; import * as moment from "moment"; +import {media_image_type} from "tc-shared/file/ImageCache"; const avatar_to_uid = (id: string) => { const buffer = new Uint8Array(id.length / 2); diff --git a/shared/js/ui/modal/ModalBookmarks.ts b/shared/js/ui/modal/ModalBookmarks.ts index fbd17840..96db5523 100644 --- a/shared/js/ui/modal/ModalBookmarks.ts +++ b/shared/js/ui/modal/ModalBookmarks.ts @@ -11,7 +11,6 @@ import { save_bookmark } from "tc-shared/bookmarks"; import {connection_log, Regex} from "tc-shared/ui/modal/ModalConnect"; -import {icon_cache_loader, IconManager} from "tc-shared/file/FileManager"; import {profiles} from "tc-shared/profiles/ConnectionProfile"; import {spawnYesNo} from "tc-shared/ui/modal/ModalYesNo"; import {Settings, settings} from "tc-shared/settings"; @@ -21,6 +20,7 @@ import * as i18nc from "tc-shared/i18n/country"; import {formatMessage} from "tc-shared/ui/frames/chat"; import * as top_menu from "../frames/MenuBar"; import {control_bar_instance} from "tc-shared/ui/frames/control-bar"; +import {icon_cache_loader, IconManager} from "tc-shared/file/Icons"; export function spawnBookmarkModal() { let modal: Modal; diff --git a/shared/js/ui/modal/ModalConnect.ts b/shared/js/ui/modal/ModalConnect.ts index 2746febc..69359d5a 100644 --- a/shared/js/ui/modal/ModalConnect.ts +++ b/shared/js/ui/modal/ModalConnect.ts @@ -5,10 +5,10 @@ import * as loader from "tc-loader"; import {createModal} from "tc-shared/ui/elements/Modal"; import {ConnectionProfile, default_profile, find_profile, profiles} from "tc-shared/profiles/ConnectionProfile"; import {KeyCode} from "tc-shared/PPTListener"; -import {icon_cache_loader, IconManager} from "tc-shared/file/FileManager"; import * as i18nc from "tc-shared/i18n/country"; import {spawnSettingsModal} from "tc-shared/ui/modal/ModalSettings"; import {server_connections} from "tc-shared/ui/frames/connection_handlers"; +import {icon_cache_loader, IconManager} from "tc-shared/file/Icons"; //FIXME: Move this shit out of this file! export namespace connection_log { diff --git a/shared/js/ui/modal/ModalIconSelect.ts b/shared/js/ui/modal/ModalIconSelect.ts index dca9ca64..9f518b87 100644 --- a/shared/js/ui/modal/ModalIconSelect.ts +++ b/shared/js/ui/modal/ModalIconSelect.ts @@ -1,7 +1,7 @@ import {ConnectionHandler} from "tc-shared/ConnectionHandler"; import PermissionType from "tc-shared/permission/PermissionType"; import {createErrorModal, createModal} from "tc-shared/ui/elements/Modal"; -import {FileEntry, spawn_upload_transfer, UploadKey} from "tc-shared/file/FileManager"; +import {FileEntry, UploadKey} from "tc-shared/file/FileManager"; import {LogCategory} from "tc-shared/log"; import * as log from "tc-shared/log"; import {CommandResult, ErrorID} from "tc-shared/connection/ServerConnectionDeclaration"; @@ -9,6 +9,7 @@ import {tra} from "tc-shared/i18n/localize"; import {arrayBufferBase64} from "tc-shared/utils/buffers"; import {Settings, settings} from "tc-shared/settings"; import * as crc32 from "tc-shared/crypto/crc32"; +import {transfer_provider} from "tc-shared/file/FileManager"; export function spawnIconSelect(client: ConnectionHandler, callback_icon?: (id: number) => any, selected_icon?: number) { selected_icon = selected_icon || 0; @@ -414,7 +415,7 @@ function handle_icon_upload(file: File, client: ConnectionHandler) : UploadingIc bar.set_value(50); bar.set_message(tr("uploading")); - const connection = spawn_upload_transfer(upload_key); + const connection = transfer_provider().spawn_upload_transfer(upload_key); try { await connection.put_data(icon.file) } catch(error) { diff --git a/shared/js/ui/modal/permission/HTMLPermissionEditor.ts b/shared/js/ui/modal/permission/HTMLPermissionEditor.ts index df7e8ff3..59eddab6 100644 --- a/shared/js/ui/modal/permission/HTMLPermissionEditor.ts +++ b/shared/js/ui/modal/permission/HTMLPermissionEditor.ts @@ -10,7 +10,6 @@ import * as contextmenu from "tc-shared/ui/elements/ContextMenu"; import {createInfoModal} from "tc-shared/ui/elements/Modal"; import {copy_to_clipboard} from "tc-shared/utils/helpers"; import PermissionType from "tc-shared/permission/PermissionType"; -import {icon_cache_loader, IconManager} from "tc-shared/file/FileManager"; import {LogCategory} from "tc-shared/log"; import * as log from "tc-shared/log"; import { @@ -18,6 +17,7 @@ import { ChangedPermissionValue, PermissionEditorMode } from "tc-shared/ui/modal/permission/AbstractPermissionEditor"; +import {icon_cache_loader, IconManager} from "tc-shared/file/Icons"; class HTMLPermission { readonly handle: HTMLPermissionEditor; diff --git a/shared/js/ui/tree/View.tsx b/shared/js/ui/tree/View.tsx index fc338044..ead95b52 100644 --- a/shared/js/ui/tree/View.tsx +++ b/shared/js/ui/tree/View.tsx @@ -35,7 +35,7 @@ export interface ChannelTreeViewState { tree_version: number; } -type TreeEntry = ChannelEntry | ServerEntry | ClientEntry; +export type TreeEntry = ChannelEntry | ServerEntry | ClientEntry; type FlatTreeEntry = { rendered: any; entry: TreeEntry;