From 1a04ec6419f8141703031881c70c6990ca322e67 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Sun, 31 Jan 2021 16:57:28 -0500
Subject: [PATCH] fix: bug where `action:settings.sorted-list.loaded` fired
 early

The hook was fired before the elements had been added to the DOM.

Also, I updated it to use the new hooks lib.
---
 public/src/modules/settings/sorted-list.js | 23 +++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/public/src/modules/settings/sorted-list.js b/public/src/modules/settings/sorted-list.js
index c7ea58d4bb..63de3c23f7 100644
--- a/public/src/modules/settings/sorted-list.js
+++ b/public/src/modules/settings/sorted-list.js
@@ -2,8 +2,9 @@
 
 define('settings/sorted-list', [
 	'benchpress',
+	'hooks',
 	'jquery-ui/widgets/sortable',
-], function (benchpress) {
+], function (benchpress, hooks) {
 	var SortedList;
 	var Settings;
 
@@ -57,13 +58,14 @@ define('settings/sorted-list', [
 						form.attr('data-sorted-list-object', key);
 						$('#content').append(form.hide());
 
-						parse($container, itemUUID, item);
+						parse($container, itemUUID, item).then(() => {
+							hooks.fire('action:settings.sorted-list.loaded', { element: $list.get(0) });
+						});
 					});
 				}
 			});
 
 			$list.sortable().addClass('pointer');
-			$(window).trigger('action:settings.sorted-list.loaded', { element: $list.get(0) });
 		},
 	};
 
@@ -113,13 +115,16 @@ define('settings/sorted-list', [
 		var $list = $container.find('[data-type="list"]');
 		var itemTpl = $container.attr('data-item-template');
 
-		app.parseAndTranslate(itemTpl, data, function (itemHtml) {
-			itemHtml = $(itemHtml);
-			$list.append(itemHtml);
-			itemHtml.attr('data-sorted-list-uuid', itemUUID);
+		return new Promise((resolve) => {
+			app.parseAndTranslate(itemTpl, data, function (itemHtml) {
+				itemHtml = $(itemHtml);
+				$list.append(itemHtml);
+				itemHtml.attr('data-sorted-list-uuid', itemUUID);
 
-			setupRemoveButton($container, itemUUID);
-			setupEditButton($container, itemUUID);
+				setupRemoveButton($container, itemUUID);
+				setupEditButton($container, itemUUID);
+				resolve();
+			});
 		});
 	}