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

closes #6419

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-04-03 15:45:32 -04:00
parent 11b15872d6
commit 8b16a63cc2
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,9 +119,8 @@ define('forum/chats', [
Chats.addCharactersLeftHandler = function (parent) { Chats.addCharactersLeftHandler = function (parent) {
var element = parent.find('[component="chat/input"]'); var element = parent.find('[component="chat/input"]');
element.on('keyup', function () { element.on('change keyup paste', function () {
parent.find('[component="chat/message/length"]').text(element.val().length); messages.updateRemainingLength(parent);
parent.find('[component="chat/message/remaining"]').text(config.maximumChatMessageLength - element.val().length);
}); });
}; };

10
public/src/client/chats/messages.js
View File

@@ -18,7 +18,7 @@ define('forum/chats/messages', ['components', 'sounds', 'translator', 'benchpres
inputEl.val(''); inputEl.val('');
inputEl.removeAttr('data-mid'); inputEl.removeAttr('data-mid');
messages.updateRemainingLength(inputEl.parent());
$(window).trigger('action:chat.sent', { $(window).trigger('action:chat.sent', {
roomId: roomId, roomId: roomId,
message: msg, message: msg,
@@ -32,6 +32,7 @@ define('forum/chats/messages', ['components', 'sounds', 'translator', 'benchpres
}, function (err) { }, function (err) {
if (err) { if (err) {
inputEl.val(msg); inputEl.val(msg);
messages.updateRemainingLength(inputEl.parent());
if (err.message === '[[error:email-not-confirmed-chat]]') { if (err.message === '[[error:email-not-confirmed-chat]]') {
return app.showEmailConfirmWarning(err); return app.showEmailConfirmWarning(err);
} }
@@ -56,12 +57,19 @@ define('forum/chats/messages', ['components', 'sounds', 'translator', 'benchpres
if (err) { if (err) {
inputEl.val(msg); inputEl.val(msg);
inputEl.attr('data-mid', mid); inputEl.attr('data-mid', mid);
messages.updateRemainingLength(inputEl.parent());
return app.alertError(err.message); return app.alertError(err.message);
} }
}); });
} }
}; };
messages.updateRemainingLength = function (parent) {
var element = parent.find('[component="chat/input"]');
parent.find('[component="chat/message/length"]').text(element.val().length);
parent.find('[component="chat/message/remaining"]').text(config.maximumChatMessageLength - element.val().length);
};
messages.appendChatMessage = function (chatContentEl, data) { messages.appendChatMessage = function (chatContentEl, data) {
var lastSpeaker = parseInt(chatContentEl.find('.chat-message').last().attr('data-uid'), 10); var lastSpeaker = parseInt(chatContentEl.find('.chat-message').last().attr('data-uid'), 10);
var lasttimestamp = parseInt(chatContentEl.find('.chat-message').last().attr('data-timestamp'), 10); var lasttimestamp = parseInt(chatContentEl.find('.chat-message').last().attr('data-timestamp'), 10);