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

WIP add user modal

Browse Source
This commit is contained in:
Julian Lam
2018-01-06 12:03:52 -05:00
parent cd4d0049e6
commit b2b57d49bf
4 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/language/en-GB/global.json
View File

@@ -134,5 +134,7 @@
"edited": "Edited",
"disabled": "Disabled",
"select": "Select"
"select": "Select",
"user-search-prompt": "Type something here to find users..."
}

2
public/language/en-GB/modules.json
View File

@@ -21,6 +21,8 @@
"chat.three_months": "3 Months",
"chat.delete_message_confirm": "Are you sure you wish to delete this message?",
"chat.add-users-to-room": "Add users to room",
"chat.retrieving-users": "Retrieving users...",
"chat.manage-room": "Manage Chat Room",
"chat.confirm-chat-with-dnd-user": "This user has set their status to DnD(Do not disturb). Do you still want to chat with them?",
"chat.rename-room": "Rename room",
"chat.rename-placeholder": "Enter your room name here",

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

@@ -48,7 +48,15 @@ define('forum/chats', [
Chats.addEventListeners = function () {
Chats.addSendHandlers(ajaxify.data.roomId, $('.chat-input'), $('.expanded-chat button[data-action="send"]'));
Chats.addPopoutHandler();
Chats.addActionHandlers(components.get('chat/messages'), ajaxify.data.roomId);
Chats.addMemberHandler(ajaxify.data.roomId, components.get('chat/controls').find('[data-action="members"]'));
Chats.addRenameHandler(ajaxify.data.roomId, components.get('chat/controls').find('[data-action="rename"]'));
Chats.addScrollHandler(ajaxify.data.roomId, ajaxify.data.uid, $('.chat-content'));
Chats.addCharactersLeftHandler($('[component="chat/main-wrapper"]'));
};
Chats.addPopoutHandler = function () {
$('[data-action="pop-out"]').on('click', function () {
var text = components.get('chat/input').val();
var roomId = ajaxify.data.roomId;
@@ -66,11 +74,6 @@ define('forum/chats', [
components.get('chat/input').val(text);
});
});
Chats.addActionHandlers(components.get('chat/messages'), ajaxify.data.roomId);
Chats.addRenameHandler(ajaxify.data.roomId, components.get('expanded-chat/controls').find('[data-action="rename"]'));
Chats.addScrollHandler(ajaxify.data.roomId, ajaxify.data.uid, $('.chat-content'));
Chats.addCharactersLeftHandler($('[component="chat/main-wrapper"]'));
};
Chats.addScrollHandler = function (roomId, uid, el) {
@@ -170,6 +173,39 @@ define('forum/chats', [
});
};
Chats.addMemberHandler = function (roomId, buttonEl) {
var modal;
buttonEl.on('click', function () {
Benchpress.parse('partials/modals/manage_room', {}, function (html) {
translator.translate(html, function (html) {
modal = bootbox.dialog({
title: '[[modules:chat.manage-room]]',
message: html,
});
modal.attr('component', 'chat/manage-modal');
socket.emit('modules.chats.getUsersInRoom', { roomId: roomId }, function (err, users) {
var listEl = modal.find('.list-group');
if (err) {
return translator.translate('[[error:invalid-data]]', function (translated) {
listEl.find('li').text(translated);
});
}
Benchpress.parse('partials/modals/manage_room_users', {
users: users,
}, function (html) {
listEl.html(html);
});
});
});
});
});
};
Chats.addRenameHandler = function (roomId, buttonEl, roomName) {
var modal;

8
src/socket.io/modules.js
View File

@@ -167,6 +167,14 @@ SocketModules.chats.loadRoom = function (socket, data, callback) {
], callback);
};
SocketModules.chats.getUsersInRoom = function (socket, data, callback) {
if (!data || !data.roomId) {
return callback(new Error('[[error:invalid-data]]'));
}
Messaging.getUsersInRoom(data.roomId, 0, -1, callback);
};
SocketModules.chats.addUserToRoom = function (socket, data, callback) {
if (!data || !data.roomId || !data.username) {
return callback(new Error('[[error:invalid-data]]'));