From c4d6afe3d62e57359465e9b284fc51ec399d2967 Mon Sep 17 00:00:00 2001
From: Pavel Djundik <xPaw@users.noreply.github.com>
Date: Sat, 2 Nov 2019 21:06:34 +0200
Subject: [PATCH] Fix removing networks

---
 client/components/ChannelWrapper.vue | 13 +------------
 client/components/NetworkLobby.vue   | 13 +++++++++++++
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/client/components/ChannelWrapper.vue b/client/components/ChannelWrapper.vue
index b61f9bb9..de021c1d 100644
--- a/client/components/ChannelWrapper.vue
+++ b/client/components/ChannelWrapper.vue
@@ -46,22 +46,11 @@ export default {
 	},
 	methods: {
 		close() {
-			let cmd = "/close";
-
-			if (this.channel.type === "lobby") {
-				cmd = "/quit";
-
-				// eslint-disable-next-line no-alert
-				if (!confirm(`Are you sure you want to remove ${this.channel.name}?`)) {
-					return false;
-				}
-			}
-
 			this.closed = true;
 
 			socket.emit("input", {
 				target: Number(this.channel.id),
-				text: cmd,
+				text: "/close",
 			});
 		},
 		getAriaLabel() {
diff --git a/client/components/NetworkLobby.vue b/client/components/NetworkLobby.vue
index 2d802710..ff950089 100644
--- a/client/components/NetworkLobby.vue
+++ b/client/components/NetworkLobby.vue
@@ -42,11 +42,13 @@
 				@click.stop="$emit('toggleJoinChannel')"
 			/>
 		</span>
+		<button class="close" hidden @click="close" />
 	</ChannelWrapper>
 </template>
 
 <script>
 import ChannelWrapper from "./ChannelWrapper.vue";
+import socket from "../js/socket";
 const storage = require("../js/localStorage");
 
 export default {
@@ -68,6 +70,17 @@ export default {
 		},
 	},
 	methods: {
+		close() {
+			// eslint-disable-next-line no-alert
+			if (!confirm(`Are you sure you want to remove ${this.channel.name}?`)) {
+				return false;
+			}
+
+			socket.emit("input", {
+				target: Number(this.channel.id),
+				text: "/quit",
+			});
+		},
 		onCollapseClick() {
 			const networks = new Set(JSON.parse(storage.get("thelounge.networks.collapsed")));
 			this.network.isCollapsed = !this.network.isCollapsed;