From 32edfb6c5a70af9063a52e14090a6da105bce901 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 30 May 2018 16:29:52 -0400
Subject: [PATCH] updating chat logic to save uuid in data-uuid attr instead of
 uuid attr

---
 public/src/app.js          |  2 +-
 public/src/modules/chat.js | 23 +++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/public/src/app.js b/public/src/app.js
index 84ad8a0fb6..d6b9833d53 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -342,7 +342,7 @@ app.cacheBuster = null;
 
 		require(['chat'], function (chat) {
 			function loadAndCenter(chatModal) {
-				chat.load(chatModal.attr('UUID'));
+				chat.load(chatModal.attr('data-uuid'));
 				chat.center(chatModal);
 				chat.focusInput(chatModal);
 			}
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index f8f44b15cd..c8f352ab2c 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -64,17 +64,17 @@ define('chat', [
 				ChatsMessages.appendChatMessage(modal.find('.chat-content'), data.message);
 
 				if (modal.is(':visible')) {
-					taskbar.updateActive(modal.attr('UUID'));
+					taskbar.updateActive(modal.attr('data-uuid'));
 					ChatsMessages.scrollToBottom(modal.find('.chat-content'));
 				} else if (!ajaxify.data.template.chats) {
-					module.toggleNew(modal.attr('UUID'), true, true);
+					module.toggleNew(modal.attr('data-uuid'), true, true);
 				}
 
 				if (!isSelf && (!modal.is(':visible') || !app.isFocused)) {
 					app.alternatingTitle('[[modules:chat.user_has_messaged_you, ' + username + ']]');
 					sounds.play('chat-incoming', 'chat.incoming:' + data.message.mid);
 
-					taskbar.push('chat', modal.attr('UUID'), {
+					taskbar.push('chat', modal.attr('data-uuid'), {
 						title: data.roomName || username,
 						touid: data.message.fromUser.uid,
 						roomId: data.roomId,
@@ -93,7 +93,7 @@ define('chat', [
 					roomData.silent = true;
 					roomData.uid = app.user.uid;
 					module.createModal(roomData, function (modal) {
-						module.toggleNew(modal.attr('UUID'), !isSelf, true);
+						module.toggleNew(modal.attr('data-uuid'), !isSelf, true);
 						if (!isSelf) {
 							app.alternatingTitle('[[modules:chat.user_has_messaged_you, ' + username + ']]');
 							sounds.play('chat-incoming', 'chat.incoming:' + data.message.mid);
@@ -112,7 +112,7 @@ define('chat', [
 			var newTitle = $('<div/>').html(data.newName).text();
 			var modal = module.getModal(data.roomId);
 			modal.find('[component="chat/room/name"]').text(newTitle);
-			taskbar.updateTitle('chat', modal.attr('UUID'), newTitle);
+			taskbar.updateTitle('chat', modal.attr('data-uuid'), newTitle);
 		});
 
 		ChatsMessages.onChatMessageEdit();
@@ -145,7 +145,7 @@ define('chat', [
 	module.bringModalToTop = function (chatModal) {
 		var topZ = 0;
 
-		taskbar.updateActive(chatModal.attr('UUID'));
+		taskbar.updateActive(chatModal.attr('data-uuid'));
 
 		if ($('.chat-modal').length === 1) {
 			return;
@@ -176,9 +176,8 @@ define('chat', [
 			chatModal.attr('id', 'chat-modal-' + data.roomId);
 			chatModal.attr('data-roomid', data.roomId);
 			chatModal.attr('intervalId', 0);
-			chatModal.attr('UUID', uuid);
+			chatModal.attr('data-uuid', uuid);
 			chatModal.css('position', 'fixed');
-			chatModal.css('zIndex', 100);
 			chatModal.appendTo($('body'));
 			chatModal.find('.timeago').timeago();
 			module.center(chatModal);
@@ -266,7 +265,7 @@ define('chat', [
 
 			Chats.addCharactersLeftHandler(chatModal);
 
-			taskbar.push('chat', chatModal.attr('UUID'), {
+			taskbar.push('chat', chatModal.attr('data-uuid'), {
 				title: data.roomName || (data.users.length ? data.users[0].username : ''),
 				roomId: data.roomId,
 				icon: 'fa-comment',
@@ -290,7 +289,7 @@ define('chat', [
 		chatModal.attr('intervalId', 0);
 		chatModal.remove();
 		chatModal.data('modal', null);
-		taskbar.discard('chat', chatModal.attr('UUID'));
+		taskbar.discard('chat', chatModal.attr('data-uuid'));
 
 		if (chatModal.attr('data-mobile')) {
 			module.disableMobileBehaviour(chatModal);
@@ -313,7 +312,7 @@ define('chat', [
 	};
 
 	module.load = function (uuid) {
-		var chatModal = $('div[UUID="' + uuid + '"]');
+		var chatModal = $('.chat-modal[data-uuid="' + uuid + '"]');
 		chatModal.removeClass('hide');
 		taskbar.updateActive(uuid);
 		ChatsMessages.scrollToBottom(chatModal.find('.chat-content'));
@@ -348,7 +347,7 @@ define('chat', [
 	};
 
 	module.minimize = function (uuid) {
-		var chatModal = $('div[UUID="' + uuid + '"]');
+		var chatModal = $('.chat-modal[data-uuid="' + uuid + '"]');
 		chatModal.addClass('hide');
 		taskbar.minimize('chat', uuid);
 		clearInterval(chatModal.attr('intervalId'));