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

fix: #10443, regression where sorted-list items did not render into the DOM in the predicted order [breaking]

Browse Source
This commit is contained in:
Julian Lam
2022-03-30 16:46:08 -04:00
parent 78afb88284
commit 46fbe15665
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/admin/settings/api.js
View File

@@ -1,13 +1,13 @@
'use strict';
define('admin/settings/api', ['settings', 'alerts'], function (settings, alerts) {
define('admin/settings/api', ['settings', 'alerts', 'hooks'], function (settings, alerts, hooks) {
const ACP = {};
ACP.init = function () {
settings.load('core.api', $('.core-api-settings'));
$('#save').on('click', saveSettings);
$(window).on('action:settings.sorted-list.loaded', (ev, { element }) => {
hooks.on('action:settings.sorted-list.itemLoaded', (ev, { element }) => {
element.addEventListener('click', (ev) => {
if (ev.target.closest('input[readonly]')) {
// Select entire input text

21
public/src/modules/settings/sorted-list.js
View File

@@ -50,7 +50,7 @@ define('settings/sorted-list', [
const list = ajaxify.data[call ? hash : 'settings'][key];
if (Array.isArray(list) && typeof list[0] !== 'string') {
await Promise.all(list.map(async (item) => {
const items = await Promise.all(list.map(async (item) => {
({ item } = await hooks.fire('filter:settings.sorted-list.loadItem', { item }));
const itemUUID = utils.generateUUID();
@@ -59,10 +59,23 @@ define('settings/sorted-list', [
form.attr('data-sorted-list-object', key);
$('#content').append(form.hide());
parse($container, itemUUID, item).then(() => {
hooks.fire('action:settings.sorted-list.loaded', { element: listEl.get(0) });
});
return { itemUUID, item };
}));
// todo: parse() needs to be refactored to return the html, so multiple calls can be parallelized
// eslint-disable-next-line no-restricted-syntax
for (const { itemUUID, item } of items) {
// eslint-disable-next-line no-await-in-loop
await parse($container, itemUUID, item);
hooks.fire('action:settings.sorted-list.itemLoaded', { element: listEl.get(0) });
}
hooks.fire('action:settings.sortd-list.loaded', {
containerEl: $container.get(0),
listEl: listEl.get(0),
hash,
key,
});
}
listEl.sortable().addClass('pointer');