From 1438ba6f934eb9c1af0677cf771fe98696d896c8 Mon Sep 17 00:00:00 2001
From: Pavel Djundik <github@xpaw.me>
Date: Wed, 22 Jun 2016 22:34:10 +0300
Subject: [PATCH 1/2] Change nicks from links to spans everywhere

Fixes #338
---
 client/css/style.css                  | 19 +++++++------------
 client/views/actions/action.tpl       |  2 +-
 client/views/actions/ctcp.tpl         |  2 +-
 client/views/actions/invite.tpl       |  4 ++--
 client/views/actions/join.tpl         |  2 +-
 client/views/actions/kick.tpl         |  4 ++--
 client/views/actions/mode.tpl         |  2 +-
 client/views/actions/nick.tpl         |  4 ++--
 client/views/actions/part.tpl         |  2 +-
 client/views/actions/quit.tpl         |  2 +-
 client/views/actions/topic.tpl        |  2 +-
 client/views/actions/topic_set_by.tpl |  2 +-
 client/views/actions/whois.tpl        | 12 ++++++------
 client/views/msg.tpl                  |  2 +-
 client/views/user.tpl                 |  2 +-
 15 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/client/css/style.css b/client/css/style.css
index f01ae4b4..dac863fb 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -117,8 +117,7 @@ input {
 	outline: 0;
 }
 
-button,
-.user {
+button {
 	border: none;
 	background: none;
 	margin: 0;
@@ -451,10 +450,6 @@ button,
 	width: 210px;
 }
 
-#footer button {
-	border: 0;
-}
-
 #footer button.active {
 	color: #fff;
 }
@@ -635,11 +630,6 @@ button,
 	line-height: 1.4;
 }
 
-#chat button:hover,
-.user:hover {
-	opacity: .6;
-}
-
 #chat .chat,
 #chat .sidebar {
 	top: 58px;
@@ -757,9 +747,14 @@ button,
 /* Nicknames */
 
 #chat .user {
+	cursor: pointer;
 	color: #50a656;
 }
 
+#chat .user:hover {
+	opacity: .6;
+}
+
 #chat.colored-nicks .user.color-1 { color: #1396cf; }
 #chat.colored-nicks .user.color-2 { color: #ffcf89; }
 #chat.colored-nicks .user.color-3 { color: #00dc5f; }
@@ -1013,7 +1008,7 @@ button,
 	width: 100%;
 }
 
-#chat .names button {
+#chat .names .user {
 	display: block;
 	line-height: 1.6;
 	padding: 0 16px;
diff --git a/client/views/actions/action.tpl b/client/views/actions/action.tpl
index fa5eefb8..3b850424 100644
--- a/client/views/actions/action.tpl
+++ b/client/views/actions/action.tpl
@@ -1,2 +1,2 @@
-<a href="#" class="user {{colorClass from}}" data-name="{{from}}">{{mode}}{{from}}</a>
+<span role="button" class="user {{colorClass from}}" data-name="{{from}}">{{mode}}{{from}}</span>
 <span class="action-text">{{{parse text}}}</span>
diff --git a/client/views/actions/ctcp.tpl b/client/views/actions/ctcp.tpl
index 9f02f804..a34513b8 100644
--- a/client/views/actions/ctcp.tpl
+++ b/client/views/actions/ctcp.tpl
@@ -1,2 +1,2 @@
-<a href="#" class="user {{colorClass from}}" data-name="{{from}}">{{from}}</a>
+<span role="button" class="user {{colorClass from}}" data-name="{{from}}">{{from}}</span>
 <b>{{ctcpType}}</b> {{{parse ctcpMessage}}}
diff --git a/client/views/actions/invite.tpl b/client/views/actions/invite.tpl
index 4f710e82..3d2e9cfa 100644
--- a/client/views/actions/invite.tpl
+++ b/client/views/actions/invite.tpl
@@ -1,9 +1,9 @@
-<a href="#" class="user {{colorClass from}}" data-name="{{from}}">{{from}}</a>
+<span role="button" class="user {{colorClass from}}" data-name="{{from}}">{{from}}</span>
 invited
 {{#if invitedYou}}
 	you
 {{else}}
-	<a href="#" class="user {{colorClass invited}}" data-name="{{invited}}">{{invited}}</a>
+	<span role="button" class="user {{colorClass invited}}" data-name="{{invited}}">{{invited}}</span>
 {{/if}}
 to
 {{{parse channel}}}
diff --git a/client/views/actions/join.tpl b/client/views/actions/join.tpl
index 265c361b..431fa62e 100644
--- a/client/views/actions/join.tpl
+++ b/client/views/actions/join.tpl
@@ -1,3 +1,3 @@
-<a href="#" class="user {{colorClass from}}" data-name="{{from}}">{{mode}}{{from}}</a>
+<span role="button" class="user {{colorClass from}}" data-name="{{from}}">{{mode}}{{from}}</span>
 <i class="hostmask">({{hostmask}})</i>
 has joined the channel
diff --git a/client/views/actions/kick.tpl b/client/views/actions/kick.tpl
index e50aae12..c66676d2 100644
--- a/client/views/actions/kick.tpl
+++ b/client/views/actions/kick.tpl
@@ -1,6 +1,6 @@
-<a href="#" class="user {{colorClass from}}" data-name="{{from}}">{{mode}}{{from}}</a>
+<span role="button" class="user {{colorClass from}}" data-name="{{from}}">{{mode}}{{from}}</span>
 has kicked
-<a href="#" class="user {{colorClass target}}" data-name="{{target}}">{{target}}</a>
+<span role="button" class="user {{colorClass target}}" data-name="{{target}}">{{target}}</span>
 {{#if text}}
 	<i class="part-reason">({{{parse text}}})</i>
 {{/if}}
diff --git a/client/views/actions/mode.tpl b/client/views/actions/mode.tpl
index 28887c9b..ba6c38b3 100644
--- a/client/views/actions/mode.tpl
+++ b/client/views/actions/mode.tpl
@@ -1,3 +1,3 @@
-<a href="#" class="user {{colorClass from}}" data-name="{{from}}">{{mode}}{{from}}</a>
+<span role="button" class="user {{colorClass from}}" data-name="{{from}}">{{mode}}{{from}}</span>
 sets mode
 {{{parse text}}}
diff --git a/client/views/actions/nick.tpl b/client/views/actions/nick.tpl
index 59f26e3a..73c790f4 100644
--- a/client/views/actions/nick.tpl
+++ b/client/views/actions/nick.tpl
@@ -1,3 +1,3 @@
-<a href="#" class="user {{colorClass nick}}" data-name="{{nick}}">{{mode}}{{nick}}</a>
+<span role="button" class="user {{colorClass nick}}" data-name="{{nick}}">{{mode}}{{nick}}</span>
 is now known as
-<a href="#" class="user {{colorClass new_nick}}" data-name="{{new_nick}}">{{mode}}{{new_nick}}</a>
+<span role="button" class="user {{colorClass new_nick}}" data-name="{{new_nick}}">{{mode}}{{new_nick}}</span>
diff --git a/client/views/actions/part.tpl b/client/views/actions/part.tpl
index 157dcb4f..99a808c6 100644
--- a/client/views/actions/part.tpl
+++ b/client/views/actions/part.tpl
@@ -1,4 +1,4 @@
-<a href="#" class="user {{colorClass from}}" data-name="{{from}}">{{mode}}{{from}}</a>
+<span role="button" class="user {{colorClass from}}" data-name="{{from}}">{{mode}}{{from}}</span>
 <i class="hostmask">({{hostmask}})</i>
 has left the channel
 {{#if text}}
diff --git a/client/views/actions/quit.tpl b/client/views/actions/quit.tpl
index 7249d1f6..ee58fab1 100644
--- a/client/views/actions/quit.tpl
+++ b/client/views/actions/quit.tpl
@@ -1,4 +1,4 @@
-<a href="#" class="user {{colorClass from}}" data-name="{{from}}">{{mode}}{{from}}</a>
+<span role="button" class="user {{colorClass from}}" data-name="{{from}}">{{mode}}{{from}}</span>
 <i class="hostmask">({{hostmask}})</i>
 has quit
 {{#if text}}
diff --git a/client/views/actions/topic.tpl b/client/views/actions/topic.tpl
index 4aac391c..661297d3 100644
--- a/client/views/actions/topic.tpl
+++ b/client/views/actions/topic.tpl
@@ -1,5 +1,5 @@
 {{#if from}}
-	<a href="#" class="user {{colorClass from}}" data-name="{{from}}">{{mode}}{{from}}</a>
+	<span role="button" class="user {{colorClass from}}" data-name="{{from}}">{{mode}}{{from}}</span>
 	has changed the topic to:
 {{else}}
 	The topic is:
diff --git a/client/views/actions/topic_set_by.tpl b/client/views/actions/topic_set_by.tpl
index 516dce9e..03364afc 100644
--- a/client/views/actions/topic_set_by.tpl
+++ b/client/views/actions/topic_set_by.tpl
@@ -1,3 +1,3 @@
 Topic set by
-<a href="#" class="user {{colorClass nick}}" data-name="{{nick}}">{{mode}}{{nick}}</a>
+<span role="button" class="user {{colorClass nick}}" data-name="{{nick}}">{{mode}}{{nick}}</span>
 on {{localeDate when}}
diff --git a/client/views/actions/whois.tpl b/client/views/actions/whois.tpl
index 40fe4cd8..be0f8e22 100644
--- a/client/views/actions/whois.tpl
+++ b/client/views/actions/whois.tpl
@@ -1,35 +1,35 @@
 <div>
-	<a href="#" class="user {{colorClass whois.nick}}" data-name="{{whois.nick}}">{{whois.nick}}</a>
+	<span role="button" class="user {{colorClass whois.nick}}" data-name="{{whois.nick}}">{{whois.nick}}</span>
 	<i class="hostmask">({{whois.user}}@{{whois.host}})</i>:
 	<b>{{whois.real_name}}</b>
 </div>
 {{#if whois.account}}
 <div>
-	<a href="#" class="user {{colorClass whois.nick}}" data-name="{{whois.nick}}">{{whois.nick}}</a>
+	<span role="button" class="user {{colorClass whois.nick}}" data-name="{{whois.nick}}">{{whois.nick}}</span>
 	is logged in as <b>{{whois.account}}</b>
 </div>
 {{/if}}
 {{#if whois.channels}}
 <div>
-	<a href="#" class="user {{colorClass whois.nick}}" data-name="{{whois.nick}}">{{whois.nick}}</a>
+	<span role="button" class="user {{colorClass whois.nick}}" data-name="{{whois.nick}}">{{whois.nick}}</span>
 	is on the following channels: {{{parse whois.channels}}}
 </div>
 {{/if}}
 {{#if whois.server}}
 <div>
-	<a href="#" class="user {{colorClass whois.nick}}" data-name="{{whois.nick}}">{{whois.nick}}</a>
+	<span role="button" class="user {{colorClass whois.nick}}" data-name="{{whois.nick}}">{{whois.nick}}</span>
 	is connected to {{whois.server}} <i>({{whois.server_info}})</i>
 </div>
 {{/if}}
 {{#if whois.secure}}
 <div>
-	<a href="#" class="user {{colorClass whois.nick}}" data-name="{{whois.nick}}">{{whois.nick}}</a>
+	<span role="button" class="user {{colorClass whois.nick}}" data-name="{{whois.nick}}">{{whois.nick}}</span>
 	is using a secure connection
 </div>
 {{/if}}
 {{#if whois.away}}
 <div>
-	<a href="#" class="user {{colorClass whois.nick}}" data-name="{{whois.nick}}">{{whois.nick}}</a>
+	<span role="button" class="user {{colorClass whois.nick}}" data-name="{{whois.nick}}">{{whois.nick}}</span>
 	is away <i>({{whois.away}})</i>
 </div>
 {{/if}}
diff --git a/client/views/msg.tpl b/client/views/msg.tpl
index 32bed856..10c79e24 100644
--- a/client/views/msg.tpl
+++ b/client/views/msg.tpl
@@ -4,7 +4,7 @@
 	</span>
 	<span class="from">
 		{{#if from}}
-		<a href="#" class="user {{colorClass from}}" data-name="{{from}}">{{mode}}{{from}}</a>
+		<span role="button" class="user {{colorClass from}}" data-name="{{from}}">{{mode}}{{from}}</span>
 		{{/if}}
 	</span>
 	{{#equal type "toggle"}}
diff --git a/client/views/user.tpl b/client/views/user.tpl
index 666fbd5e..7b83c4e8 100644
--- a/client/views/user.tpl
+++ b/client/views/user.tpl
@@ -13,7 +13,7 @@
 			{{/unless}}
 			<div class="user-mode {{modes mode}}">
 			{{/diff}}
-			<button class="user {{colorClass name}}" data-name="{{name}}">{{mode}}{{name}}</button>
+			<span role="button" class="user {{colorClass name}}" data-name="{{name}}">{{mode}}{{name}}</span>
 		{{/each}}
 		</div>
 	</div>

From 7289844182675de4cf08818dee6fd96ca110b9d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= <jeremie@astori.fr>
Date: Fri, 24 Jun 2016 02:31:28 -0400
Subject: [PATCH 2/2] Select search targets based on class and not element

This fixes the search after changing from buttons to spans.
---
 client/js/lounge.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/js/lounge.js b/client/js/lounge.js
index a67bf019..342db87c 100644
--- a/client/js/lounge.js
+++ b/client/js/lounge.js
@@ -771,7 +771,7 @@ $(function() {
 	chat.on("input", ".search", function() {
 		var value = $(this).val().toLowerCase();
 		var names = $(this).closest(".users").find(".names");
-		names.find("button").each(function() {
+		names.find(".user").each(function() {
 			var btn = $(this);
 			var name = btn.text().toLowerCase().replace(/[+%@~]/, "");
 			if (name.indexOf(value) === 0) {