Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-15 18:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-vendors

Browse Source
This commit is contained in:
Julian Lam
2016-04-04 18:46:24 -04:00
parent b73af30a2b 1aaf65e9be
commit f91f705f90
610 changed files with 7299 additions and 3194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/client/chats.js
View File

@@ -242,7 +242,7 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
if (data.users && data.users.length) {
data.users.forEach(function(user) {
tagEl.tagsinput('add', user.username);
tagEl.tagsinput('add', $('<div/>').html(user.username).text());
});
}
@@ -376,7 +376,7 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
Chats.onChatEdit();
socket.on('event:chats.roomRename', function(data) {
$('[component="chat/room/name"]').val(data.newName);
$('[component="chat/room/name"]').val($('<div/>').html(data.newName).text());
});
};