From 685951966bbd86d049b3bc15d78579a5a1949571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= <jeremie@astori.fr>
Date: Fri, 22 Dec 2017 22:10:14 -0500
Subject: [PATCH] Rename "Client Settings" into "Settings" in tooltip, cleanup

---
 client/index.html   | 4 ++--
 client/js/lounge.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/index.html b/client/index.html
index 3c3b253e..1c3640e9 100644
--- a/client/index.html
+++ b/client/index.html
@@ -39,7 +39,7 @@
 		<footer id="footer">
 			<span class="tooltipped tooltipped-n tooltipped-no-touch" aria-label="Sign in"><button class="icon sign-in" data-target="#sign-in" aria-label="Sign in"></button></span>
 			<span class="tooltipped tooltipped-n tooltipped-no-touch" aria-label="Connect to network"><button class="icon connect" data-target="#connect" aria-label="Connect to network"></button></span>
-			<span class="tooltipped tooltipped-n tooltipped-no-touch" aria-label="Client settings"><button class="icon settings" data-target="#settings" aria-label="Client settings"></button></span>
+			<span class="tooltipped tooltipped-n tooltipped-no-touch" aria-label="Settings"><button class="icon settings" data-target="#settings" aria-label="Settings"></button></span>
 			<span class="tooltipped tooltipped-n tooltipped-no-touch" aria-label="Help"><button class="icon help" data-target="#help" aria-label="Help"></button></span>
 			<span class="tooltipped tooltipped-n tooltipped-no-touch" aria-label="Sign out"><button class="icon sign-out" id="sign-out" aria-label="Sign out"></button></span>
 		</footer>
@@ -83,7 +83,7 @@
 				</div>
 				<div id="sign-in" class="window"></div>
 				<div id="connect" class="window"></div>
-				<div id="settings" class="window" data-type="settings"></div>
+				<div id="settings" class="window"></div>
 				<div id="help" class="window"></div>
 			</div>
 		</div>
diff --git a/client/js/lounge.js b/client/js/lounge.js
index 826e6036..3e4c3158 100644
--- a/client/js/lounge.js
+++ b/client/js/lounge.js
@@ -433,7 +433,7 @@ $(function() {
 		}
 
 		var chanChat = chan.find(".chat");
-		if (chanChat.length > 0 && chan.data("type") !== "special") {
+		if (chanChat.length > 0 && type !== "special") {
 			chanChat.sticky();
 		}
 
@@ -442,7 +442,7 @@ $(function() {
 			socket.emit("names", {target: self.data("id")});
 		}
 
-		if (type === "settings") {
+		if (target === "#settings") {
 			$("#session-list").html("<p>Loading…</p>");
 			socket.emit("sessions:get");
 		}