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

fix(sorted-list): call loadItem hook on add/edit items as well as on item retrieval, refactor edit to call parse()

Browse Source
This commit is contained in:
Julian Lam
2022-02-22 13:26:30 -05:00
parent 914733e44b
commit 1c8d1d231e
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,7 +67,7 @@ define('settings/sorted-list', [
listEl.sortable().addClass('pointer'); listEl.sortable().addClass('pointer');
}, },
addItem: function ($formElements, $target) { addItem: async ($formElements, $target) => {
const key = $target.attr('data-sorted-list'); const key = $target.attr('data-sorted-list');
const itemUUID = utils.generateUUID(); const itemUUID = utils.generateUUID();
const form = $('<form class="" data-sorted-list-uuid="' + itemUUID + '" data-sorted-list-object="' + key + '"></form>'); const form = $('<form class="" data-sorted-list-uuid="' + itemUUID + '" data-sorted-list-object="' + key + '"></form>');
@@ -75,7 +75,8 @@ define('settings/sorted-list', [
$('#content').append(form.hide()); $('#content').append(form.hide());
const data = Settings.helper.serializeForm(form); let data = Settings.helper.serializeForm(form);
({ item: data } = await hooks.fire('filter:settings.sorted-list.loadItem', { item: data }));
parse($target, itemUUID, data); parse($target, itemUUID, data);
}, },
}; };
@@ -90,7 +91,6 @@ define('settings/sorted-list', [
function setupEditButton($container, itemUUID) { function setupEditButton($container, itemUUID) {
const $list = $container.find('[data-type="list"]'); const $list = $container.find('[data-type="list"]');
const key = $container.attr('data-sorted-list'); const key = $container.attr('data-sorted-list');
const itemTpl = $container.attr('data-item-template');
const editBtn = $('[data-sorted-list-uuid="' + itemUUID + '"] [data-type="edit"]'); const editBtn = $('[data-sorted-list-uuid="' + itemUUID + '"] [data-type="edit"]');
editBtn.on('click', function () { editBtn.on('click', function () {
@@ -102,7 +102,7 @@ define('settings/sorted-list', [
el.value = form.find(`select#${el.id}`).val(); el.value = form.find(`select#${el.id}`).val();
}); });
const modal = bootbox.confirm(clone, function (save) { const modal = bootbox.confirm(clone, async (save) => {
if (save) { if (save) {
const form = $('<form class="" data-sorted-list-uuid="' + itemUUID + '" data-sorted-list-object="' + key + '"></form>'); const form = $('<form class="" data-sorted-list-uuid="' + itemUUID + '" data-sorted-list-object="' + key + '"></form>');
form.append(modal.find('form').children()); form.append(modal.find('form').children());
@@ -111,25 +111,19 @@ define('settings/sorted-list', [
$('#content').append(form.hide()); $('#content').append(form.hide());
const data = Settings.helper.serializeForm(form); let data = Settings.helper.serializeForm(form);
({ item: data } = await hooks.fire('filter:settings.sorted-list.loadItem', { item: data }));
stripTags(data); stripTags(data);
app.parseAndTranslate(itemTpl, data, function (itemHtml) { const oldItem = $list.find('[data-sorted-list-uuid="' + itemUUID + '"]');
itemHtml = $(itemHtml); parse($container, itemUUID, data, oldItem);
const oldItem = $list.find('[data-sorted-list-uuid="' + itemUUID + '"]');
oldItem.after(itemHtml);
oldItem.remove();
itemHtml.attr('data-sorted-list-uuid', itemUUID);
setupRemoveButton($container, itemUUID);
setupEditButton($container, itemUUID);
});
} }
}); });
}); });
} }
function parse($container, itemUUID, data) { function parse($container, itemUUID, data, replaceEl) {
// replaceEl is optional
const $list = $container.find('[data-type="list"]'); const $list = $container.find('[data-type="list"]');
const itemTpl = $container.attr('data-item-template'); const itemTpl = $container.attr('data-item-template');
@@ -138,7 +132,11 @@ define('settings/sorted-list', [
return new Promise((resolve) => { return new Promise((resolve) => {
app.parseAndTranslate(itemTpl, data, function (itemHtml) { app.parseAndTranslate(itemTpl, data, function (itemHtml) {
itemHtml = $(itemHtml); itemHtml = $(itemHtml);
$list.append(itemHtml); if (replaceEl) {
replaceEl.replaceWith(itemHtml);
} else {
$list.append(itemHtml);
}
itemHtml.attr('data-sorted-list-uuid', itemUUID); itemHtml.attr('data-sorted-list-uuid', itemUUID);
setupRemoveButton($container, itemUUID); setupRemoveButton($container, itemUUID);