From 7ce2f10662d355f01d4dd97072673f9b002114f6 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Sun, 10 Jan 2021 14:26:35 +0100 Subject: [PATCH] Some minor bugfixing --- shared/js/events/ClientGlobalControlHandler.ts | 2 +- shared/js/ui/modal/ModalConnect.ts | 2 -- shared/js/ui/modal/connect/Controller.ts | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/shared/js/events/ClientGlobalControlHandler.ts b/shared/js/events/ClientGlobalControlHandler.ts index 30f1376d..5268c40b 100644 --- a/shared/js/events/ClientGlobalControlHandler.ts +++ b/shared/js/events/ClientGlobalControlHandler.ts @@ -172,7 +172,7 @@ export function initialize(event_registry: Registry) event_registry.on("action_open_window_connect", event => { spawnConnectModalNew({ - connectInANewTab: true + connectInANewTab: event.newTab }); }); diff --git a/shared/js/ui/modal/ModalConnect.ts b/shared/js/ui/modal/ModalConnect.ts index 36ccbcfc..1f24d304 100644 --- a/shared/js/ui/modal/ModalConnect.ts +++ b/shared/js/ui/modal/ModalConnect.ts @@ -1,5 +1,3 @@ -declare const native_client; - export const Regex = { //DOMAIN<:port> DOMAIN: /^(localhost|((([a-zA-Z0-9_-]{0,63}\.){0,253})?[a-zA-Z0-9_-]{0,63}\.[a-zA-Z]{2,64}))(|:(6553[0-5]|655[0-2][0-9]|65[0-4][0-9]{2}|6[0-4][0-9]{3}|[0-5]?[0-9]{1,46}))$/, diff --git a/shared/js/ui/modal/connect/Controller.ts b/shared/js/ui/modal/connect/Controller.ts index 6fb850b8..a3ceb6c5 100644 --- a/shared/js/ui/modal/connect/Controller.ts +++ b/shared/js/ui/modal/connect/Controller.ts @@ -393,6 +393,7 @@ export function spawnConnectModalNew(options: ConnectModalOptions) { let connection: ConnectionHandler; if(event.newTab) { connection = server_connections.spawn_server_connection(); + server_connections.set_active_connection(connection); } else { connection = server_connections.active_connection(); }