From ad52d1a1aadb49bf2bee320398365bea54f3ebaf Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 22 Oct 2016 18:17:39 -0400 Subject: [PATCH] latest chats design --- public/src/client/chats.js | 6 +++++- public/src/client/chats/messages.js | 2 +- public/src/modules/chat.js | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/public/src/client/chats.js b/public/src/client/chats.js index abab76f965..0e49a462ee 100644 --- a/public/src/client/chats.js +++ b/public/src/client/chats.js @@ -28,6 +28,10 @@ define('forum/chats', [ Chats.createTagsInput($('[component="chat/messages"] .users-tag-input'), ajaxify.data); Chats.createAutoComplete($('[component="chat/input"]')); + components.get('expanded-chat/controlsToggle').on('click', function() { + components.get('expanded-chat/controls').toggleClass('hide'); + }); + if (env === 'md' || env === 'lg') { Chats.resizeMainWindow(); Chats.addHotkeys(); @@ -317,7 +321,7 @@ define('forum/chats', [ roomEl.addClass("unread"); } else { var recentEl = components.get('chat/recent'); - templates.parse('partials/chat_recent_room', { + templates.parse('partials/chats/recent_room', { rooms: { "roomId": data.roomId, "lastUser": data.message.fromUser, "usernames": data.message.fromUser.username, "unread": true } }, function (html) { translator.translate(html, function (translated) { diff --git a/public/src/client/chats/messages.js b/public/src/client/chats/messages.js index 9d91910493..3bce27f416 100644 --- a/public/src/client/chats/messages.js +++ b/public/src/client/chats/messages.js @@ -71,7 +71,7 @@ define('forum/chats/messages', ['components', 'sounds', 'translator'], function messages.parseMessage = function (data, callback) { - templates.parse('partials/chat_message' + (Array.isArray(data) ? 's' : ''), { + templates.parse('partials/chats/message' + (Array.isArray(data) ? 's' : ''), { messages: data }, function (html) { translator.translate(html, callback); diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index af7ef0fff3..5705a70825 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -117,7 +117,7 @@ define('chat', [ return room.teaser; }); - templates.parse('partials/chat_dropdown', { + templates.parse('partials/chats/dropdown', { rooms: rooms }, function (html) { translator.translate(html, function (translated) {