* 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 78a9e90..d7bc74b 100644 (file)
--- a/libs/cbi/htdocs/luci-static/resources/cbi.js
+++ b/libs/cbi/htdocs/luci-static/resources/cbi.js
@@ -1,66 +1,80 @@
-var cbi_d = {};
+var cbi_d = [];
 
-function cbi_d_add(field, target, value) {
-       if (!cbi_d[target]) {
-               cbi_d[target] = {};
-       }
-       if (!cbi_d[target][value]) {
-               cbi_d[target][value] = [];
-       }
-       
+function cbi_d_add(field, dep, next) {
        var obj = document.getElementById(field);
        if (obj) {
-               var entry = {
-                       "node": obj,
-                       "parent": obj.parentNode,
-                       "next": obj.nextSibling 
-               } 
-               cbi_d[target][value].unshift(entry);
-       }
-}
-
-function cbi_d_update(target) {
-       if (!cbi_d[target]) {
-               return;
-       }
-       
-       for (var x in cbi_d[target]) {
-               for (var i=0; i<cbi_d[target][x].length; i++) { 
-                       var entry = cbi_d[target][x][i];
-                       if (entry.node.parentNode) {
-                               entry.parent.removeChild(entry.node)
+               var entry
+               for (var i=0; i<cbi_d.length; i++) {
+                       if (cbi_d[i].id == field) {
+                               entry = cbi_d[i];
+                               break;
                        }
                }
+               if (!entry) {
+                       entry = {
+                               "node": obj,
+                               "id": field,
+                               "parent": obj.parentNode.id,
+                               "next": next,
+                               "deps": []
+                       };
+                       cbi_d.unshift(entry);
+               }
+               entry.deps.push(dep)
        }
-       
+}
+
+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 : "";
                }
        }
-       
-       if (cbi_d[target][value]) {
-               for (var i=0; i<cbi_d[target][value].length; i++) {             
-                       var entry = cbi_d[target][value][i];
-                       if (!entry.next) {
-                               entry.parent.appendChild(entry.node);
-                       } else {
-                               entry.parent.insertBefore(entry.node, entry.next);
-                       }
+
+       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_checkvalue(j, deps[i][j]))
+               }
+               if (istat) {
+                       return true
                }
        }
 }
 
-function cbi_d_init() {
-       for (var x in cbi_d) {
-               cbi_d_update(x);
+function cbi_d_update() {
+       var state = false;
+       for (var i=0; i<cbi_d.length; i++) {
+               var entry = cbi_d[i];
+               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 {
+                               next.parentNode.insertBefore(entry.node, next);
+                       }
+                       state = (state || (node && node.parentNode))
+               }
+       }
+       if (state) {
+               cbi_d_update();
        }
 }
 
@@ -86,9 +100,20 @@ 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");
-       obj.parentNode.appendChild(sel);
+       sel.id = selid;
+       sel.className = 'cbi-input-select';
+       if (obj.nextSibling) {
+               obj.parentNode.insertBefore(sel, obj.nextSibling);
+       } else {
+               obj.parentNode.appendChild(sel);
+       }
 
        if (!values[obj.value]) {
                if (obj.value == "") {
@@ -141,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
+}