From: Paul Donald <newtwen+github@gmail.com>
Date: Sat, 11 Jan 2025 01:47:30 +0000 (+0100)
Subject: luci-base: fix createChoiceElement regex to catch closing tags with !
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2520588d002f5b8eac4194fbf311e7495282d30b;p=project%2Fluci.git

luci-base: fix createChoiceElement regex to catch closing tags with !

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
---

diff --git a/modules/luci-base/htdocs/luci-static/resources/ui.js b/modules/luci-base/htdocs/luci-static/resources/ui.js
index f077b41253..bff9acc3c0 100644
--- a/modules/luci-base/htdocs/luci-static/resources/ui.js
+++ b/modules/luci-base/htdocs/luci-static/resources/ui.js
@@ -1598,7 +1598,7 @@ const UIDropdown = UIElement.extend(/** @lends LuCI.ui.Dropdown.prototype */ {
 		let markup = null;
 
 		if (tpl)
-			markup = (tpl.textContent ?? tpl.innerHTML ?? tpl.firstChild.data).replace(/^<!--|-->$/, '').trim();
+			markup = (tpl.textContent ?? tpl.innerHTML ?? tpl.firstChild.data).replace(/^<!--|--!?>$/g, '').trim();
 		else
 			markup = '<li data-value="{{value}}"><span data-label-placeholder="true" /></li>';