Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-24 00:09:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #11112, cleanup autocomplete markup for chats

Browse Source 
after modal is closed
when switching chats on chats page
when navigation to another page from a chat page
This commit is contained in:
Barış Soner Uşaklı
2022-12-23 11:48:09 -05:00
parent d1087106e4
commit f5e609ae6a
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,10 +23,15 @@ define('forum/chats', [
) {
const Chats = {
initialised: false,
activeAutocomplete: {},
};
let newMessage = false;
$(window).on('action:ajaxify.start', function () {
Chats.destroyAutoComplete(ajaxify.data.roomId);
});
Chats.init = function () {
const env = utils.findBootstrapEnvironment();
@@ -40,7 +45,7 @@ define('forum/chats', [
Chats.addEventListeners();
Chats.setActive();
if (env === 'md' || env === 'lg') {
if (env === 'md' || env === 'lg' || env === 'xl' || env === 'xxl') {
Chats.addHotkeys();
}
@@ -69,7 +74,7 @@ define('forum/chats', [
Chats.addScrollBottomHandler($('.chat-content'));
Chats.addCharactersLeftHandler($('[component="chat/main-wrapper"]'));
Chats.addIPHandler($('[component="chat/main-wrapper"]'));
Chats.createAutoComplete($('[component="chat/input"]'));
Chats.createAutoComplete(ajaxify.data.roomId, $('[component="chat/input"]'));
Chats.addUploadHandler({
dragDropAreaEl: $('.chats-full'),
pasteEl: $('[component="chat/input"]'),
@@ -303,6 +308,7 @@ define('forum/chats', [
if (modal.length) {
chatModule.close(modal);
} else {
Chats.destroyAutoComplete(roomId);
ajaxify.go('chats');
}
}).catch(alerts.error);
@@ -373,7 +379,7 @@ define('forum/chats', [
});
};
Chats.createAutoComplete = function (element) {
Chats.createAutoComplete = function (roomId, element) {
if (!element.length) {
return;
}
@@ -388,12 +394,20 @@ define('forum/chats', [
top: 'inherit',
},
placement: 'top',
className: `chat-autocomplete-dropdown-${roomId} dropdown-menu textcomplete-dropdown`,
},
};
$(window).trigger('chat:autocomplete:init', data);
if (data.strategies.length) {
autocomplete.setup(data);
Chats.activeAutocomplete[roomId] = autocomplete.setup(data);
}
};
Chats.destroyAutoComplete = function (roomId) {
if (Chats.activeAutocomplete[roomId]) {
Chats.activeAutocomplete[roomId].destroy();
delete Chats.activeAutocomplete[roomId];
}
};
@@ -405,7 +419,7 @@ define('forum/chats', [
} else {
el.remove();
}
Chats.destroyAutoComplete(roomId);
const modal = chatModule.getModal(roomId);
if (modal.length) {
chatModule.close(modal);
@@ -418,7 +432,7 @@ define('forum/chats', [
if (!roomid) {
roomid = '';
}
Chats.destroyAutoComplete(ajaxify.data.roomId);
const url = 'user/' + ajaxify.data.userslug + '/chats/' + roomid + window.location.search;
if (self.fetch) {
fetch(config.relative_path + '/api/' + url, { credentials: 'include' })

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

@@ -296,7 +296,7 @@ define('chat', [
Chats.addSendHandlers(chatModal.attr('data-roomid'), chatModal.find('.chat-input'), chatModal.find('[data-action="send"]'));
Chats.addMemberHandler(chatModal.attr('data-roomid'), chatModal.find('[data-action="members"]'));
Chats.createAutoComplete(chatModal.find('[component="chat/input"]'));
Chats.createAutoComplete(chatModal.attr('data-roomid'), chatModal.find('[component="chat/input"]'));
Chats.addScrollHandler(chatModal.attr('data-roomid'), data.uid, chatModal.find('.chat-content'));
Chats.addScrollBottomHandler(chatModal.find('.chat-content'));
@@ -348,6 +348,9 @@ define('chat', [
if (chatModal.attr('data-mobile')) {
module.disableMobileBehaviour(chatModal);
}
require(['forum/chats'], function (chats) {
chats.destroyAutoComplete(chatModal.attr('data-roomid'));
});
hooks.fire('action:chat.closed', {
uuid: uuid,