From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 5 Nov 2018 10:11:46 +0000 (+0100)
Subject: luci-base: cbi.js: add heuristics to attribute handling in E()
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f4c39dd6ff6f60dc48982d822faa6d9a85c2e4d7;p=oweals%2Fluci.git

luci-base: cbi.js: add heuristics to attribute handling in E()

If a given attribute value is a function, register it as event listener,
if it is an object, filter it through JSON.stringify(), else set it
as-is.

This helps to reduce some boiler-plate code when building DOM structures.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js
index 3ace96f32..d9b9baf7b 100644
--- a/modules/luci-base/htdocs/luci-static/resources/cbi.js
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js
@@ -1506,7 +1506,18 @@ function E()
 	if (attr)
 		for (var key in attr)
 			if (attr.hasOwnProperty(key) && attr[key] !== null && attr[key] !== undefined)
-				elem.setAttribute(key, attr[key]);
+				switch (typeof(attr[key])) {
+				case 'function':
+					elem.addEventListener(key, attr[key]);
+					break;
+
+				case 'object':
+					elem.setAttribute(key, JSON.stringify(attr[key]));
+					break;
+
+				default:
+					elem.setAttribute(key, attr[key]);
+				}
 
 	if (typeof(data) === 'function')
 		data = data(elem);