From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 30 Dec 2019 13:40:57 +0000 (+0100)
Subject: luci-base: form.js: implement AbstractValue.getUIElement()
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=344609e9ee9b28c0f548da9a8f6c5d54ea02aed8;p=oweals%2Fluci.git

luci-base: form.js: implement AbstractValue.getUIElement()

Introduce a new method `getUIElement()` which simplifies obtaining the
underlying per-section UI widget class instance for a from option object.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9e259174323a406b93664e307bb8a50fc3d80483)
---

diff --git a/modules/luci-base/htdocs/luci-static/resources/form.js b/modules/luci-base/htdocs/luci-static/resources/form.js
index 1c6f84304..180cd61a6 100644
--- a/modules/luci-base/htdocs/luci-static/resources/form.js
+++ b/modules/luci-base/htdocs/luci-static/resources/form.js
@@ -765,6 +765,12 @@ var CBIAbstractValue = CBINode.extend({
 			this.ucioption || this.option);
 	},
 
+	getUIElement: function(section_id) {
+		var node = this.map.findElement('id', this.cbid(section_id)),
+		    inst = node ? L.dom.findClassInstance(node) : null;
+		return (inst instanceof ui.AbstractElement) ? inst : null;
+	},
+
 	cfgvalue: function(section_id, set_value) {
 		if (section_id == null)
 			L.error('TypeError', 'Section ID required');
@@ -778,8 +784,8 @@ var CBIAbstractValue = CBINode.extend({
 	},
 
 	formvalue: function(section_id) {
-		var node = this.map.findElement('id', this.cbid(section_id));
-		return node ? L.dom.callClassMethod(node, 'getValue') : null;
+		var elem = this.getUIElement(section_id);
+		return elem ? elem.getValue() : null;
 	},
 
 	textvalue: function(section_id) {
@@ -796,8 +802,8 @@ var CBIAbstractValue = CBINode.extend({
 	},
 
 	isValid: function(section_id) {
-		var node = this.map.findElement('id', this.cbid(section_id));
-		return node ? L.dom.callClassMethod(node, 'isValid') : true;
+		var elem = this.getUIElement(section_id);
+		return elem ? elem.isValid() : true;
 	},
 
 	isActive: function(section_id) {
@@ -817,8 +823,8 @@ var CBIAbstractValue = CBINode.extend({
 	},
 
 	triggerValidation: function(section_id) {
-		var node = this.map.findElement('id', this.cbid(section_id));
-		return node ? L.dom.callClassMethod(node, 'triggerValidation') : true;
+		var elem = this.getUIElement(section_id);
+		return elem ? elem.triggerValidation() : true;
 	},
 
 	parse: function(section_id) {
@@ -1742,9 +1748,8 @@ var CBIFlagValue = CBIValue.extend({
 	},
 
 	formvalue: function(section_id) {
-		var node = this.map.findElement('id', this.cbid(section_id)),
-		    checked = node ? L.dom.callClassMethod(node, 'isChecked') : false;
-
+		var elem = this.getUIElement(section_id),
+		    checked = elem ? elem.isChecked() : false;
 		return checked ? this.enabled : this.disabled;
 	},