From 30ce17ef735aa26603703c82efe38d32ab99ba09 Mon Sep 17 00:00:00 2001 From: pichalite Date: Fri, 15 Apr 2016 17:44:16 +0000 Subject: [PATCH 1/3] mark room unread on new message --- public/src/client/chats.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/public/src/client/chats.js b/public/src/client/chats.js index 672a12b57a..3ed356e876 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -366,6 +366,24 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll', data.message.self = data.self; Chats.appendChatMessage($('.expanded-chat .chat-content'), data.message); + } else { + if (ajaxify.currentPage.startsWith("chats")) { + var roomEl = $('[data-roomid=' + data.roomId + ']'); + + if (roomEl.length > 0) { + roomEl.addClass("unread"); + } else { + console.log(data); + var recentEl = components.get('chat/recent'); + templates.parse('partials/chat_recent_room', { + rooms: { "roomId": data.roomId, "lastUser": data.message.fromUser, "usernames": data.message.fromUser.username, "unread": true } + }, function(html) { + translator.translate(html, function(translated) { + recentEl.prepend(translated); + }); + }); + } + } } }); From b5d798077f9ba2148a05a8591fec97706bbf436f Mon Sep 17 00:00:00 2001 From: pichalite Date: Fri, 15 Apr 2016 10:57:58 -0700 Subject: [PATCH 2/3] remove log :fail: --- public/src/client/chats.js | 1 - 1 file changed, 1 deletion(-) diff --git a/public/src/client/chats.js b/public/src/client/chats.js index 3ed356e876..af4f764c7c 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -373,7 +373,6 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll', if (roomEl.length > 0) { roomEl.addClass("unread"); } else { - console.log(data); var recentEl = components.get('chat/recent'); templates.parse('partials/chat_recent_room', { rooms: { "roomId": data.roomId, "lastUser": data.message.fromUser, "usernames": data.message.fromUser.username, "unread": true } From dd3c00d9e27d5d74c71e110a1bca81c2147a03d0 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 18 Apr 2016 14:56:41 -0400 Subject: [PATCH 3/3] updated theme versions --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 8872941618..f925c9b50b 100644 --- a/package.json +++ b/package.json @@ -56,8 +56,8 @@ "nodebb-plugin-spam-be-gone": "0.4.6", "nodebb-rewards-essentials": "0.0.8", "nodebb-theme-lavender": "3.0.9", - "nodebb-theme-persona": "4.0.121", - "nodebb-theme-vanilla": "5.0.65", + "nodebb-theme-persona": "4.0.122", + "nodebb-theme-vanilla": "5.0.66", "nodebb-widget-essentials": "2.0.9", "nodemailer": "2.0.0", "nodemailer-sendmail-transport": "1.0.0", @@ -115,4 +115,4 @@ "url": "https://github.com/barisusakli" } ] -} \ No newline at end of file +}