Node.js based forum software built for the modern web
fix: modals need benchpress.render
Barış Soner Uşaklıfa77f1eeda9a
diff --git a/public/src/admin/dashboard.js b/public/src/admin/dashboard.jsindex f52574df97..ab78c2bb93 100644--- a/public/src/admin/dashboard.js+++ b/public/src/admin/dashboard.js@@ -15,6 +15,7 @@ import {import * as modals from '../modules/modals';import * as alerts from '../modules/alerts';import * as translator from '../modules/translator';+import * as Benchpress from 'benchpressjs';import { formattedNumber, escape } from '../modules/helpers';import { setupFullscreen } from './modules/fullscreen';@@ -370,7 +371,7 @@ function setupGraphs(callback) {});async function throwCustomRangeSelector(targetEl) {- const html = await app.parseAndTranslate('admin/partials/pageviews-range-select', {});+ const html = await Benchpress.render('admin/partials/pageviews-range-select', {});const modal = await modals.dialog({title: '[[admin/dashboard:page-views-custom]]',message: html,diff --git a/public/src/admin/manage/users.js b/public/src/admin/manage/users.jsindex 82cf963b76..9312344d6b 100644--- a/public/src/admin/manage/users.js+++ b/public/src/admin/manage/users.js@@ -15,7 +15,8 @@ define('admin/manage/users', [ajaxify.go(window.location.pathname + '?' + qs);});- $('.export-csv').on('click', async function () {+ $('.export-csv').on('click', async function (ev) {+ ev.preventDefault();socket.once('event:export-users-csv', function () {alerts.remove('export-users-start');alerts.alert({diff --git a/public/src/admin/manage/users/custom-fields.js b/public/src/admin/manage/users/custom-fields.jsindex 5e2a58aa13..296256e797 100644--- a/public/src/admin/manage/users/custom-fields.js+++ b/public/src/admin/manage/users/custom-fields.js@@ -1,6 +1,6 @@define('admin/manage/user/custom-fields', [- 'modals', 'alerts', 'iconSelect', 'jquery-ui/widgets/sortable',-], function (modals, alerts, iconSelect) {+ 'modals', 'alerts', 'iconSelect', 'benchpress', 'jquery-ui/widgets/sortable',+], function (modals, alerts, iconSelect, Benchpress) {const manageUserFields = {};manageUserFields.init = function () {@@ -57,7 +57,7 @@ define('admin/manage/user/custom-fields', [}async function showModal(field = null) {- const html = await app.parseAndTranslate('admin/partials/manage-custom-user-fields-modal', field);+ const html = await Benchpress.render('admin/partials/manage-custom-user-fields-modal', field);const modal = await modals.dialog({message: html,diff --git a/public/src/client/chats/manage.js b/public/src/client/chats/manage.jsindex bffc9053af..d1e08e5ed5 100644--- a/public/src/client/chats/manage.js+++ b/public/src/client/chats/manage.js@@ -2,8 +2,8 @@define('forum/chats/manage', [- 'api', 'alerts', 'autocomplete', 'forum/chats/user-list', 'modals',-], function (api, alerts, autocomplete, userList, modals) {+ 'api', 'alerts', 'autocomplete', 'forum/chats/user-list', 'modals', 'benchpress',+], function (api, alerts, autocomplete, userList, modals, Benchpress) {const manage = {};manage.init = function (roomId, buttonEl) {@@ -25,7 +25,7 @@ define('forum/chats/manage', [}}- const html = await app.parseAndTranslate('modals/manage-room', {+ const html = await Benchpress.render('modals/manage-room', {groups,user: app.user,room: ajaxify.data,diff --git a/public/src/modules/accounts/invite.js b/public/src/modules/accounts/invite.jsindex 306effb1d8..2221f3fca7 100644--- a/public/src/modules/accounts/invite.js+++ b/public/src/modules/accounts/invite.js@@ -11,7 +11,7 @@ define('accounts/invite', ['api', 'benchpress', 'modals', 'alerts'], function (a$('[component="user/invite"]').on('click', function (e) {e.preventDefault();api.get(`/api/v3/users/${app.user.uid}/invites/groups`, {}).then((groups) => {- Benchpress.parse('modals/invite', { groups }, function (html) {+ Benchpress.render('modals/invite', { groups }, function (html) {modals.dialog({message: html,title: `[[${isACP() ? 'admin/manage/users:invite' : 'users:invite'}]]`,diff --git a/public/src/modules/categorySelector.js b/public/src/modules/categorySelector.jsindex 00db488162..5ee9a8da94 100644--- a/public/src/modules/categorySelector.js+++ b/public/src/modules/categorySelector.js@@ -78,7 +78,6 @@ define('categorySelector', [const html = await Benchpress.render('admin/partials/categories/select-category', {message: options.message,});- console.log('pre translate', html);const modal = await modals.dialog({title: options.title || '[[modules:composer.select-category]]',message: html,