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

refactor: deprecate app.openChat/newChat

Browse Source 
use chat.openChat/newChat instead
This commit is contained in:
Barış Soner Uşaklı
2021-11-08 22:20:41 -05:00
parent 1a9b15989b
commit f352be63dc
7 changed files with 112 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,14 +8,14 @@ define('forum/chats', [
'forum/chats/recent',
'forum/chats/search',
'forum/chats/messages',
'benchpress',
'composer/autocomplete',
'hooks',
'bootbox',
'chat',
], function (
components, translator, mousetrap,
recentChats, search, messages, Benchpress,
autocomplete, hooks, bootbox
recentChats, search, messages,
autocomplete, hooks, bootbox, chatModule
) {
const Chats = {
initialised: false,
@@ -93,11 +93,11 @@ define('forum/chats', [
if (app.previousUrl && app.previousUrl.match(/chats/)) {
ajaxify.go('user/' + ajaxify.data.userslug + '/chats', function () {
app.openChat(roomId, ajaxify.data.uid);
chatModule.openChat(roomId, ajaxify.data.uid);
}, true);
} else {
window.history.go(-1);
app.openChat(roomId, ajaxify.data.uid);
chatModule.openChat(roomId, ajaxify.data.uid);
}
$(window).one('action:chat.loaded', function () {
@@ -294,9 +294,7 @@ define('forum/chats', [
// Return user to chats page. If modal, close modal.
const modal = buttonEl.parents('.chat-modal');
if (modal.length) {
require(['chat'], function (chatLib) {
chatLib.close(modal);
});
chatModule.close(modal);
} else {
ajaxify.go('chats');
}
@@ -408,12 +406,11 @@ define('forum/chats', [
} else {
el.remove();
}
require(['chat'], function (chat) {
const modal = chat.getModal(roomId);
if (modal.length) {
chat.close(modal);
}
});
const modal = chatModule.getModal(roomId);
if (modal.length) {
chatModule.close(modal);
}
});
};