hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
isekai-main
Barış Soner Uşaklı 2 years ago
parent 3cef2535cc d8d486a633
commit de2f76bbd3
5 changed files with 58 additions and 37 deletions
Show Stats Download Patch File Download Diff File

20
public/src/client/chats.js
Unescape Escape View File

@ -55,7 +55,7 @@ define('forum/chats', [
Chats.initialised = true;
messages.scrollToBottom($('.expanded-chat ul.chat-content'));
messages.wrapImagesInLinks($('.expanded-chat ul.chat-content'));
search.init();
};
@ -69,6 +69,7 @@ define('forum/chats', [
Chats.addScrollHandler(ajaxify.data.roomId, ajaxify.data.uid, $('.chat-content'));
Chats.addScrollBottomHandler($('.chat-content'));
Chats.addCharactersLeftHandler($('[component="chat/main-wrapper"]'));
Chats.addTextareaResizeHandler($('[component="chat/main-wrapper"]'));
Chats.addIPHandler($('[component="chat/main-wrapper"]'));
Chats.createAutoComplete(ajaxify.data.roomId, $('[component="chat/input"]'));
Chats.addUploadHandler({
@ -169,10 +170,8 @@ define('forum/chats', [
messages.parseMessage(data, function (html) {
const currentScrollTop = el.scrollTop();
const previousHeight = el[0].scrollHeight;
html = $(html);
el.prepend(html);
html.find('.timeago').timeago();
html.find('img:not(.not-responsive)').addClass('img-fluid');
messages.onMessagesAddedToDom(html);
el.scrollTop((el[0].scrollHeight - previousHeight) + currentScrollTop);
loading = false;
});
@ -195,6 +194,19 @@ define('forum/chats', [
});
};
Chats.addTextareaResizeHandler = function (parent) {
// https://stackoverflow.com/questions/454202/creating-a-textarea-with-auto-resize
const textarea = parent.find('[component="chat/input"]');
textarea.on('input', function () {
const isAtBottom = messages.isAtBottom(parent.find('.chat-content'));
textarea.css({ height: 0 });
textarea.css({ height: textarea.prop('scrollHeight') + 'px' });
if (isAtBottom) {
messages.scrollToBottom(parent.find('.chat-content'));
}
});
};
Chats.addActionHandlers = function (element, roomId) {
element.on('click', '[data-action]', function () {
const messageId = $(this).parents('[data-mid]').attr('data-mid');

40
public/src/client/chats/messages.js
Unescape Escape View File

@ -3,8 +3,11 @@
define('forum/chats/messages', [
'components', 'translator', 'benchpress', 'hooks',
'bootbox', 'alerts', 'messages', 'api',
], function (components, translator, Benchpress, hooks, bootbox, alerts, messagesModule, api) {
'bootbox', 'alerts', 'messages', 'api', 'forum/topic/images',
], function (
components, translator, Benchpress, hooks,
bootbox, alerts, messagesModule, api, images
) {
const messages = {};
messages.sendMessage = async function (roomId, inputEl) {
@ -49,18 +52,9 @@ define('forum/chats/messages', [
};
messages.updateTextAreaHeight = function (chatContentEl) {
// https://stackoverflow.com/questions/454202/creating-a-textarea-with-auto-resize
const textarea = chatContentEl.find('[component="chat/input"]');
const scrollHeight = textarea.prop('scrollHeight');
textarea.css({ height: scrollHeight + 'px' });
textarea.on('input', function () {
const isAtBottom = messages.isAtBottom(chatContentEl.find('.chat-content'));
textarea.css({ height: 0 });
textarea.css({ height: textarea.prop('scrollHeight') + 'px' });
if (isAtBottom) {
messages.scrollToBottom(chatContentEl.find('.chat-content'));
}
});
};
function autoresizeTextArea(textarea) {
@ -89,8 +83,7 @@ define('forum/chats/messages', [
const newMessage = $(html);
const isAtBottom = messages.isAtBottom(chatContentEl);
newMessage.appendTo(chatContentEl);
newMessage.find('.timeago').timeago();
newMessage.find('img:not(.not-responsive)').addClass('img-fluid');
messages.onMessagesAddedToDom(newMessage);
if (isAtBottom) {
messages.scrollToBottom(chatContentEl);
}
@ -100,10 +93,15 @@ define('forum/chats/messages', [
});
}
messages.onMessagesAddedToDom = function (messageEls) {
messageEls.find('.timeago').timeago();
messageEls.find('img:not(.not-responsive)').addClass('img-fluid');
messages.wrapImagesInLinks(messageEls.first().parent());
};
messages.parseMessage = function (data, callback) {
function done(html) {
translator.translate(html, callback);
translator.translate(html, translated => callback($(translated)));
}
const tplData = {
messages: data,
@ -134,6 +132,12 @@ define('forum/chats/messages', [
}
};
messages.wrapImagesInLinks = function (containerEl) {
containerEl.find('[component="chat/message/body"] img:not(.emoji)').each(function () {
images.wrapImageInLink($(this));
});
};
messages.toggleScrollUpAlert = function (containerEl) {
const isAtBottom = messages.isAtBottom(containerEl, 300);
containerEl.parent()
@ -225,7 +229,7 @@ define('forum/chats/messages', [
const body = components.get('chat/message', message.messageId);
if (body.length) {
body.replaceWith(html);
components.get('chat/message', message.messageId).find('.timeago').timeago();
messages.onMessagesAddedToDom(html);
}
});
});
@ -234,13 +238,15 @@ define('forum/chats/messages', [
function onChatMessageDeleted(messageId) {
components.get('chat/message', messageId)
.toggleClass('deleted', true)
.find('[component="chat/message/body"]').translateHtml('[[modules:chat.message-deleted]]');
.find('[component="chat/message/body"]')
.translateHtml('[[modules:chat.message-deleted]]');
}
function onChatMessageRestored(message) {
components.get('chat/message', message.messageId)
.toggleClass('deleted', false)
.find('[component="chat/message/body"]').html(message.content);
.find('[component="chat/message/body"]')
.html(message.content);
}
messages.delete = function (messageId, roomId) {

3
public/src/client/topic/events.js
Unescape Escape View File

@ -9,9 +9,8 @@ define('forum/topic/events', [
'forum/topic/images',
'components',
'translator',
'benchpress',
'hooks',
], function (postTools, threadTools, posts, images, components, translator, Benchpress, hooks) {
], function (postTools, threadTools, posts, images, components, translator, hooks) {
const Events = {};
const events = {

18
public/src/client/topic/images.js
Unescape Escape View File

@ -4,30 +4,32 @@
define('forum/topic/images', [], function () {
const Images = {};
const suffixRegex = /-resized(\.[\w]+)?$/;
Images.wrapImagesInLinks = function (posts) {
posts.find('[component="post/content"] img:not(.emoji)').each(function () {
const $this = $(this);
let src = $this.attr('src') || '';
const alt = $this.attr('alt') || '';
const suffixRegex = /-resized(\.[\w]+)?$/;
Images.wrapImageInLink($(this));
});
};
Images.wrapImageInLink = function (imageEl) {
let src = imageEl.attr('src') || '';
if (src === 'about:blank') {
return;
}
if (!imageEl.parent().is('a')) {
if (utils.isRelativeUrl(src) && suffixRegex.test(src)) {
src = src.replace(suffixRegex, '$1');
}
const alt = imageEl.attr('alt') || '';
const srcExt = src.split('.').slice(1).pop();
const altFilename = alt.split('/').pop();
const altExt = altFilename.split('.').slice(1).pop();
if (!$this.parent().is('a')) {
$this.wrap('<a href="' + src + '" ' +
imageEl.wrap('<a href="' + src + '" ' +
(!srcExt && altExt ? ' download="' + altFilename + '" ' : '') +
' target="_blank" rel="noopener">');
}
});
};
return Images;

2
public/src/modules/chat.js
Unescape Escape View File

@ -246,6 +246,7 @@ define('chat', [
chatModal.css('position', 'fixed');
chatModal.appendTo($('body'));
chatModal.find('.timeago').timeago();
ChatsMessages.wrapImagesInLinks(chatModal.find('[component="chat/messages"] .chat-content'));
module.center(chatModal);
app.loadJQueryUI(function () {
@ -332,6 +333,7 @@ define('chat', [
Chats.addScrollBottomHandler(chatModal.find('.chat-content'));
Chats.addCharactersLeftHandler(chatModal);
Chats.addTextareaResizeHandler(chatModal);
Chats.addIPHandler(chatModal);
Chats.addUploadHandler({

Write Preview
Loading…
Cancel
Save