luci-base: cbi: fix reverse field order after dependency change

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

diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js
index 15645d9..8bf94a6 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/cbi.js
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js
@@ -13,7 +13,6 @@
 
 var cbi_d = [];
 var cbi_t = [];
-var cbi_c = [];
 
 var cbi_validators = {
 
@@ -345,7 +344,7 @@ var cbi_validators = {
        {
                return (this.match(/^[0-9\*#!\.]+$/) != null);
        },
-        'timehhmmss': function()
+       'timehhmmss': function()
        {
                return (this.match(/^[0-6][0-9]:[0-6][0-9]:[0-6][0-9]$/) != null);
        },
@@ -389,12 +388,12 @@ var cbi_validators = {
 };
 
 
-function cbi_d_add(field, dep, next) {
-       var obj = document.getElementById(field);
+function cbi_d_add(field, dep, index) {
+       var obj = (typeof(field) === 'string') ? document.getElementById(field) : field;
        if (obj) {
                var entry
                for (var i=0; i<cbi_d.length; i++) {
-                       if (cbi_d[i].id == field) {
+                       if (cbi_d[i].id == obj.id) {
                                entry = cbi_d[i];
                                break;
                        }
@@ -402,10 +401,10 @@ function cbi_d_add(field, dep, next) {
                if (!entry) {
                        entry = {
                                "node": obj,
-                               "id": field,
+                               "id": obj.id,
                                "parent": obj.parentNode.id,
-                               "next": next,
-                               "deps": []
+                               "deps": [],
+                               "index": index
                        };
                        cbi_d.unshift(entry);
                }
@@ -468,24 +467,28 @@ 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)
+               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 = true;
-                       if( entry.parent && typeof(cbi_c[entry.parent]) == 'number')
-                               cbi_c[entry.parent]--;
                } else if ((!node || !node.parentNode) && cbi_d_check(entry.deps)) {
+                       var next = undefined;
+
+                       for (next = parent.firstChild; next; next = next.nextSibling) {
+                               if (next.getAttribute && parseInt(next.getAttribute('data-index'), 10) > entry.index) {
+                                       break;
+                               }
+                       }
+
                        if (!next) {
                                parent.appendChild(entry.node);
                        } else {
-                               next.parentNode.insertBefore(entry.node, next);
+                               parent.insertBefore(entry.node, next);
                        }
+
                        state = true;
-                       if( entry.parent && typeof(cbi_c[entry.parent]) == 'number' )
-                               cbi_c[entry.parent]++;
                }
        }
 
@@ -499,6 +502,22 @@ function cbi_d_update() {
        }
 }
 
+function cbi_init() {
+       var nodes = document.querySelectorAll('[data-depends]');
+
+       for (var i = 0, node; (node = nodes[i]) !== undefined; i++) {
+               var index = parseInt(node.getAttribute('data-index'), 10);
+               var depends = JSON.parse(node.getAttribute('data-depends'));
+               if (!isNaN(index) && depends.length > 0) {
+                       for (var alt = 0; alt < depends.length; alt++) {
+                               cbi_d_add(node, depends[alt], index);
+                       }
+               }
+       }
+
+       cbi_d_update();
+}
+
 function cbi_bind(obj, type, callback, mode) {
        if (!obj.addEventListener) {
                obj.attachEvent('on' + type,
@@ -876,27 +895,6 @@ function cbi_dynlist_init(name, respath, datatype, optional, url, defpath, choic
        cbi_dynlist_redraw(NaN, -1, -1);
 }
 
-//Hijacks the CBI form to send via XHR (requires Prototype)
-function cbi_hijack_forms(layer, win, fail, load) {
-       var forms = layer.getElementsByTagName('form');
-       for (var i=0; i<forms.length; i++) {
-               $(forms[i]).observe('submit', function(event) {
-                       // Prevent the form from also submitting the regular way
-                       event.stop();
-
-                       // Submit via XHR
-                       event.element().request({
-                               onSuccess: win,
-                               onFailure: fail
-                       });
-
-                       if (load) {
-                               load();
-                       }
-               });
-       }
-}
-
 
 function cbi_t_add(section, tab) {
        var t = document.getElementById('tab.' + section + '.' + tab);
@@ -935,25 +933,24 @@ function cbi_t_update() {
        for( var sid in cbi_t )
                for( var tid in cbi_t[sid] )
                {
-                       if (typeof(cbi_c[cbi_t[sid][tid].cid]) !== 'number') {
-                               continue;
-                       }
-                       else if( cbi_c[cbi_t[sid][tid].cid] == 0 ) {
-                               cbi_t[sid][tid].tab.style.display = 'none';
-                       }
-                       else if( cbi_t[sid][tid].tab && cbi_t[sid][tid].tab.style.display == 'none' ) {
-                               cbi_t[sid][tid].tab.style.display = '';
+                       var t = cbi_t[sid][tid].tab;
+                       var c = cbi_t[sid][tid].container;
+                       var n = c.getElementsByTagName('div');
 
-                               var t = cbi_t[sid][tid].tab;
+                       if (n.length === 0) {
+                               t.style.display = 'none';
+                       }
+                       else if (t.style.display == 'none') {
+                               t.style.display = '';
                                t.className += ' cbi-tab-highlighted';
                                hl_tabs.push(t);
                        }
 
-                       cbi_tag_last(cbi_t[sid][tid].container);
+                       cbi_tag_last(c);
                        updated = true;
                }
 
-       if( hl_tabs.length > 0 )
+       if (hl_tabs.length > 0)
                window.setTimeout(function() {
                        for( var i = 0; i < hl_tabs.length; i++ )
                                hl_tabs[i].className = hl_tabs[i].className.replace(/ cbi-tab-highlighted/g, '');