From 5fdf5a51275e78cca31a6010df9eebcbd72f5521 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Sat, 6 Jul 2019 16:04:18 +0200 Subject: [PATCH] Fixed build --- shared/js/connection/HandshakeHandler.ts | 6 +++--- shared/js/crypto/sha.ts | 5 ++++- shared/js/ui/modal/ModalBanList.ts | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/shared/js/connection/HandshakeHandler.ts b/shared/js/connection/HandshakeHandler.ts index 5d983564..36912c50 100644 --- a/shared/js/connection/HandshakeHandler.ts +++ b/shared/js/connection/HandshakeHandler.ts @@ -1,4 +1,3 @@ -declare const native: any; //FIXME: Read client declarations! namespace connection { export interface HandshakeIdentityHandler { connection: AbstractServerConnection; @@ -68,8 +67,9 @@ namespace connection { } private handshake_finished(version?: string) { - if(native_client && window["native"] && native.client_version && !version) { - native.client_version() + const _native = window["native"]; + if(native_client && _native && _native.client_version && !version) { + _native.client_version() .then( this.handshake_finished.bind(this)) .catch(error => { console.error(tr("Failed to get version:")); diff --git a/shared/js/crypto/sha.ts b/shared/js/crypto/sha.ts index b13f3c80..28998cff 100644 --- a/shared/js/crypto/sha.ts +++ b/shared/js/crypto/sha.ts @@ -3,9 +3,12 @@ declare function unescape(string: string): string; declare class _sha1 { static arrayBuffer($: ArrayBuffer) : ArrayBuffer; } + +/* interface Window { TextEncoder: any; } +*/ namespace sha { /* @@ -381,7 +384,7 @@ namespace sha { })(); export function encode_text(buffer: string) : ArrayBuffer { - if (window.TextEncoder) { + if ((window as any).TextEncoder) { return new TextEncoder().encode(buffer).buffer; } let utf8 = unescape(encodeURIComponent(buffer)); diff --git a/shared/js/ui/modal/ModalBanList.ts b/shared/js/ui/modal/ModalBanList.ts index d1010d48..53b9d627 100644 --- a/shared/js/ui/modal/ModalBanList.ts +++ b/shared/js/ui/modal/ModalBanList.ts @@ -296,13 +296,13 @@ namespace Modals { event.preventDefault(); - spawn_context_menu(event.pageX, event.pageY, { + contextmenu.spawn_context_menu(event.pageX, event.pageY, { name: "Edit", - type: MenuEntryType.ENTRY, + type: contextmenu.MenuEntryType.ENTRY, callback: () => cb_edit(parseInt(element.attr("ban-id"))) }, { name: "Delete", - type: MenuEntryType.ENTRY, + type: contextmenu.MenuEntryType.ENTRY, callback: () => cb_delete(parseInt(element.attr("ban-id"))) }); };