* luci/libs/cbi: also set css class names for dynamically generated select lists

[project/luci.git] / libs / cbi / htdocs / luci-static / resources / cbi.js

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi.js b/libs/cbi/htdocs/luci-static/resources/cbi.js
index 227e332..d7bc74b 100644 (file)
--- a/libs/cbi/htdocs/luci-static/resources/cbi.js
+++ b/libs/cbi/htdocs/luci-static/resources/cbi.js
@@ -1,6 +1,6 @@
 var cbi_d = [];
 
-function cbi_d_add(field, dep) {       
+function cbi_d_add(field, dep, next) {
        var obj = document.getElementById(field);
        if (obj) {
                var entry
@@ -12,61 +12,65 @@ function cbi_d_add(field, dep) {
                }
                if (!entry) {
                        entry = {
-                               "id": field,
                                "node": obj,
-                               "parent": obj.parentNode,
-                               "next": obj.nextSibling,
+                               "id": field,
+                               "parent": obj.parentNode.id,
+                               "next": next,
                                "deps": []
                        };
                        cbi_d.unshift(entry);
-               }       
+               }
                entry.deps.push(dep)
        }
 }
 
-function cbi_d_value(target) {
+function cbi_d_checkvalue(target, ref) {
        var t = document.getElementById(target);
-       var value
-       
+       var value;
+
        if (!t || !t.value) {
                value = "";
        } else {
                value = t.value;
-               
+
                if (t.type == "checkbox") {
                        value = t.checked ? value : "";
                }
        }
-       
-       return value
+
+       return (value == ref)
 }
 
 function cbi_d_check(deps) {
        for (var i=0; i<deps.length; i++) {
                var istat = true
                for (var j in deps[i]) {
-                       istat = (istat && cbi_d_value(j) == deps[i][j])
+                       istat = (istat && cbi_d_checkvalue(j, deps[i][j]))
                }
                if (istat) {
                        return true
                }
-       }               
+       }
 }
 
 function cbi_d_update() {
        var state = false;
        for (var i=0; i<cbi_d.length; i++) {
                var entry = cbi_d[i];
-               if (entry.node.parentNode && !cbi_d_check(entry.deps)) {
-                       entry.parent.removeChild(entry.node);
-                       state = (state || !entry.node.parentNode)
-               } else if (!entry.node.parentNode && cbi_d_check(entry.deps)) {
-                       if (!entry.next) {
-                               entry.parent.appendChild(entry.node);
+               var next  = document.getElementById(entry.next)
+               var node  = document.getElementById(entry.id)
+               var parent = document.getElementById(entry.parent)
+
+               if (node && node.parentNode && !cbi_d_check(entry.deps)) {
+                       node.parentNode.removeChild(node);
+                       state = (state || !node.parentNode)
+               } else if ((!node || !node.parentNode) && cbi_d_check(entry.deps)) {
+                       if (!next) {
+                               parent.appendChild(entry.node);
                        } else {
-                               entry.parent.insertBefore(entry.node, entry.next);
-                       }               
-                       state = (state || entry.node.parentNode)
+                               next.parentNode.insertBefore(entry.node, next);
+                       }
+                       state = (state || (node && node.parentNode))
                }
        }
        if (state) {
@@ -96,10 +100,17 @@ function cbi_bind(obj, type, callback, mode) {
 }
 
 function cbi_combobox(id, values, def, man) {
+       var selid = "cbi.combobox." + id;
+       if (document.getElementById(selid)) {
+               return
+       }
+
        var obj = document.getElementById(id)
        var sel = document.createElement("select");
+       sel.id = selid;
+       sel.className = 'cbi-input-select';
        if (obj.nextSibling) {
-               obj.parentNode.insertBefore(sel, obj.nextSibling);      
+               obj.parentNode.insertBefore(sel, obj.nextSibling);
        } else {
                obj.parentNode.appendChild(sel);
        }
@@ -155,4 +166,4 @@ function cbi_combobox_init(id, values, def, man) {
                cbi_combobox(id, values, def, man)
        });
        cbi_combobox(id, values, def, man);
-}
\ No newline at end of file
+}