From 5d4400ef9029a2ed06af902b5e0564b66d489e6a Mon Sep 17 00:00:00 2001
From: Pavel Djundik <xPaw@users.noreply.github.com>
Date: Thu, 30 Aug 2018 21:12:53 +0300
Subject: [PATCH] Revert "Remove draggable for now"

This reverts commit f4c0a68fde99471bd546902ec2b9301ff6cec73a.
---
 client/components/NetworkList.vue | 21 ++++++++++++++-------
 package.json                      |  1 -
 yarn.lock                         |  4 ----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/client/components/NetworkList.vue b/client/components/NetworkList.vue
index 4927ad1e..588970e3 100644
--- a/client/components/NetworkList.vue
+++ b/client/components/NetworkList.vue
@@ -7,12 +7,11 @@
 	<Draggable
 		v-else
 		:list="networks"
-		:options="{ handle: '.lobby', draggable: '.network', ghostClass: 'network-placeholder' }"
+		:options="{ handle: '.lobby', draggable: '.network', ghostClass: 'network-placeholder', disabled: isSortingEnabled }"
 		class="networks"
 		@change="onNetworkSort"
 		@start="onDragStart"
-		@end="onDragEnd"
-	>
+		@end="onDragEnd">
 		<div
 			v-for="network in networks"
 			:id="'network-' + network.uuid"
@@ -38,15 +37,15 @@
 				@toggleJoinChannel="network.isJoinChannelShown = !network.isJoinChannelShown" />
 
 			<Draggable
-				:options="{ draggable: '.chan', ghostClass: 'chan-placeholder' }"
+				:options="{ draggable: '.chan', ghostClass: 'chan-placeholder', disabled: isSortingEnabled }"
 				:list="network.channels"
 				class="channels"
 				@change="onChannelSort"
 				@start="onDragStart"
-				@end="onDragEnd"
-			>
+				@end="onDragEnd">
 				<Channel
-					v-for="channel in getChannelsWithoutLobby(network)"
+					v-for="(channel, index) in network.channels"
+					v-if="index > 0"
 					:key="channel.id"
 					:channel="channel"
 					:network="network"
@@ -76,6 +75,14 @@ export default {
 		activeChannel: Object,
 		networks: Array,
 	},
+	computed: {
+		isSortingEnabled() {
+			const isTouch = !!("ontouchstart" in window || (window.DocumentTouch && document instanceof window.DocumentTouch));
+
+			// TODO: Implement a way to sort on touch devices
+			return isTouch;
+		},
+	},
 	methods: {
 		onDragStart(e) {
 			e.target.classList.add("ui-sortable-helper");
diff --git a/package.json b/package.json
index a9317f39..b0b7949b 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,6 @@
     "intersection-observer": "0.5.1",
     "istanbul-instrumenter-loader": "3.0.1",
     "jquery": "3.3.1",
-    "jquery-ui": "1.12.1",
     "mini-css-extract-plugin": "0.5.0",
     "mocha": "5.2.0",
     "mocha-loader": "2.0.0",
diff --git a/yarn.lock b/yarn.lock
index 145c53c3..22d59ebd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4115,10 +4115,6 @@ istanbul-reports@^2.1.0:
   dependencies:
     handlebars "^4.0.11"
 
-jquery-ui@1.12.1:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"
-
 jquery@3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"