From 1086937b9bf2f69d9bf1453b1a9883e0524d7a15 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@mcgalaxy.de>
Date: Sun, 2 Dec 2018 19:27:03 +0100
Subject: [PATCH] Fixed some stuff

---
 ChangeLog.md                       | 2 ++
 shared/html/templates.html         | 6 +++---
 shared/js/ui/modal/ModalConnect.ts | 2 +-
 shared/js/ui/view.ts               | 4 ++++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 43d76951..ed58b3d4 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -5,6 +5,8 @@
     - Enabled log grouping
     - Improved permission popup performance
     - Showing a better client version on client info
+    - When you press enter while a channel is selected let you enter this channel
+    - Fixed connect file select overflow
     
 * **1.12.18**
     - Added the possibility to navigate via arrow keys within the channel tree
diff --git a/shared/html/templates.html b/shared/html/templates.html
index bec74b22..5133381c 100644
--- a/shared/html/templates.html
+++ b/shared/html/templates.html
@@ -132,9 +132,9 @@
                     <hr>
                     <div class="identity_config_TEAMSPEAK identity_config">
                         Please enter your exported TS3 Identity string bellow or select your exported Identity<br>
-                        <div style="width: 100%; display: flex; flex-direction: row">
-                            <input placeholder="Identity string" style="width: 70%; margin: 5px;" class="identity_string">
-                            <div style="width: 30%; margin: 5px"><input class="identity_file" type="file"></div>
+                        <div style="width: 100%; display: flex; justify-content: stretch; flex-direction: row">
+                            <input placeholder="Identity string" style="min-width: 60%; flex-shrink: 1; flex-grow: 2; margin: 5px;" class="identity_string">
+                            <div style="max-width: 200px; flex-grow: 1; flex-shrink: 4; margin: 5px"><input style="display: flex; width: 100%;" class="identity_file" type="file"></div>
                         </div>
                     </div>
                     <div class="identity_config_TEAFORO identity_config">
diff --git a/shared/js/ui/modal/ModalConnect.ts b/shared/js/ui/modal/ModalConnect.ts
index 1a1a3293..1a85adb5 100644
--- a/shared/js/ui/modal/ModalConnect.ts
+++ b/shared/js/ui/modal/ModalConnect.ts
@@ -191,7 +191,7 @@ namespace Modals {
                 return tag;
             },
 
-            width: 600,
+            width: '70%',
             //closeable: false
         });
         connectModal.open();
diff --git a/shared/js/ui/view.ts b/shared/js/ui/view.ts
index d619b04c..33ff5d07 100644
--- a/shared/js/ui/view.ts
+++ b/shared/js/ui/view.ts
@@ -703,6 +703,10 @@ class ChannelTree {
                 this.select_next_channel(channel, false);
             } else if(this.currently_selected instanceof ServerEntry)
                 this.onSelect(this.channel_first, true);
+        } else if(event.keyCode == JQuery.Key.Enter) {
+            if(this.currently_selected instanceof ChannelEntry) {
+                this.currently_selected.joinChannel();
+            }
         }
     }
 }
\ No newline at end of file