mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-02-27 00:51:16 +01:00
refactor: use app.parseAndTranslate
This commit is contained in:
@@ -2,11 +2,10 @@
|
|||||||
|
|
||||||
|
|
||||||
define('forum/chats/messages', [
|
define('forum/chats/messages', [
|
||||||
'components', 'translator', 'benchpress', 'hooks',
|
'components', 'hooks', 'bootbox', 'alerts',
|
||||||
'bootbox', 'alerts', 'messages', 'api', 'forum/topic/images',
|
'messages', 'api', 'forum/topic/images',
|
||||||
], function (
|
], function (
|
||||||
components, translator, Benchpress, hooks,
|
components, hooks, bootbox, alerts, messagesModule, api, images
|
||||||
bootbox, alerts, messagesModule, api, images
|
|
||||||
) {
|
) {
|
||||||
const messages = {};
|
const messages = {};
|
||||||
|
|
||||||
@@ -106,17 +105,15 @@ define('forum/chats/messages', [
|
|||||||
};
|
};
|
||||||
|
|
||||||
messages.parseMessage = function (data, callback) {
|
messages.parseMessage = function (data, callback) {
|
||||||
function done(html) {
|
|
||||||
translator.translate(html, translated => callback($(translated)));
|
|
||||||
}
|
|
||||||
const tplData = {
|
const tplData = {
|
||||||
messages: data,
|
messages: data,
|
||||||
isAdminOrGlobalMod: app.user.isAdmin || app.user.isGlobalMod,
|
isAdminOrGlobalMod: app.user.isAdmin || app.user.isGlobalMod,
|
||||||
|
|
||||||
};
|
};
|
||||||
if (Array.isArray(data)) {
|
if (Array.isArray(data)) {
|
||||||
Benchpress.render('partials/chats/messages', tplData).then(done);
|
app.parseAndTranslate('partials/chats/messages', tplData).then(callback);
|
||||||
} else {
|
} else {
|
||||||
Benchpress.render('partials/chats/' + (data.system ? 'system-message' : 'message'), tplData).then(done);
|
app.parseAndTranslate('partials/chats/' + (data.system ? 'system-message' : 'message'), tplData).then(callback);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -256,16 +253,14 @@ define('forum/chats/messages', [
|
|||||||
}
|
}
|
||||||
|
|
||||||
messages.delete = function (messageId, roomId) {
|
messages.delete = function (messageId, roomId) {
|
||||||
translator.translate('[[modules:chat.delete_message_confirm]]', function (translated) {
|
bootbox.confirm('[[modules:chat.delete_message_confirm]]', function (ok) {
|
||||||
bootbox.confirm(translated, function (ok) {
|
if (!ok) {
|
||||||
if (!ok) {
|
return;
|
||||||
return;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
api.del(`/chats/${roomId}/messages/${messageId}`, {}).then(() => {
|
api.del(`/chats/${roomId}/messages/${messageId}`, {}).then(() => {
|
||||||
components.get('chat/message', messageId).toggleClass('deleted', true);
|
components.get('chat/message', messageId).toggleClass('deleted', true);
|
||||||
}).catch(alerts.error);
|
}).catch(alerts.error);
|
||||||
});
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user