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

closes #2070

Browse Source
This commit is contained in:
barisusakli
2014-11-16 17:29:45 -05:00
parent 807d4b7e2e
commit 32e08ba419
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ define('forum/chats', ['string', 'sounds', 'forum/infinitescroll'], function(S,
}); });
inputEl.on('keypress', function(e) { inputEl.on('keypress', function(e) {
if(e.which === 13) { if(e.which === 13 && !e.shiftKey) {
Chats.sendMessage(Chats.getRecipientUid(), inputEl); Chats.sendMessage(Chats.getRecipientUid(), inputEl);
} }
}); });

6
public/src/modules/chat.js
View File

@@ -353,8 +353,8 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
function addSendHandler(chatModal) { function addSendHandler(chatModal) {
var input = chatModal.find('#chat-message-input'); var input = chatModal.find('#chat-message-input');
input.off('keypress').on('keypress', function(e) { input.off('keypress').on('keypress', function(e) {
if(e.which === 13) { if (e.which === 13 && !e.shiftKey) {
Chats.sendMessage(chatModal.attr('touid'), chatModal.find('#chat-message-input')); Chats.sendMessage(chatModal.attr('touid'), input);
} }
}); });
@@ -369,7 +369,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar,
}); });
chatModal.find('#chat-message-send-btn').off('click').on('click', function(e){ chatModal.find('#chat-message-send-btn').off('click').on('click', function(e){
Chats.sendMessage(chatModal.attr('touid'), chatModal.find('#chat-message-input')); Chats.sendMessage(chatModal.attr('touid'), input);
return false; return false;
}); });
} }