From e0ec340de85e0cde4c6e50d0b22c3aff9165ffab Mon Sep 17 00:00:00 2001
From: Richard Lewis <richrd.lewis@gmail.com>
Date: Sat, 3 Aug 2019 21:48:06 +0300
Subject: [PATCH] Fix oversights during rebase.

---
 client/components/ChannelWrapper.vue | 4 +++-
 client/js/lounge.js                  | 4 ++--
 client/js/socket-events/index.js     | 1 -
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/components/ChannelWrapper.vue b/client/components/ChannelWrapper.vue
index b4a3951b..2f5bf26d 100644
--- a/client/components/ChannelWrapper.vue
+++ b/client/components/ChannelWrapper.vue
@@ -1,6 +1,7 @@
 <template>
 	<!-- TODO: move closed style to it's own class -->
 	<div
+		ref="element"
 		v-if="
 			!network.isCollapsed ||
 				channel.highlight ||
@@ -49,7 +50,8 @@ export default {
 			if (this.channel.type === "lobby") {
 				cmd = "/quit";
 
-				if (!confirm(`Are you sure you want to remove ${this.channel.name}?`)) { // eslint-disable-line no-alert
+				if (!confirm(`Are you sure you want to remove ${this.channel.name}?`)) {
+					// eslint-disable-line no-alert
 					return false;
 				}
 			}
diff --git a/client/js/lounge.js b/client/js/lounge.js
index 5304ac53..85bdb2d2 100644
--- a/client/js/lounge.js
+++ b/client/js/lounge.js
@@ -102,7 +102,7 @@ window.vueMounted = () => {
 
 			socket.emit("open", channel ? channel.channel.id : null);
 
-			if (!keepSidebarOpen && $(window).outerWidth() <= utils.mobileViewportPixels) {
+			if ($(window).outerWidth() <= utils.mobileViewportPixels) {
 				vueApp.setSidebar(false);
 			}
 		} else {
@@ -110,7 +110,7 @@ window.vueMounted = () => {
 			const component = self.attr("data-component");
 			vueApp.$store.commit("activeWindow", component);
 
-			if (!keepSidebarOpen && $(window).outerWidth() <= utils.mobileViewportPixels) {
+			if ($(window).outerWidth() <= utils.mobileViewportPixels) {
 				vueApp.setSidebar(false);
 			}
 		}
diff --git a/client/js/socket-events/index.js b/client/js/socket-events/index.js
index 5453e74f..a46ef27a 100644
--- a/client/js/socket-events/index.js
+++ b/client/js/socket-events/index.js
@@ -1,7 +1,6 @@
 "use strict";
 
 require("./auth");
-require("./change_password");
 require("./commands");
 require("./init");
 require("./join");