X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fcbi%2Fhtdocs%2Fluci-static%2Fresources%2Fcbi.js;h=247228d225b47d6a3f15a88e3ecefae176153be7;hp=24f929c9bc48ff000f1b4eb2dbac9363439e495a;hb=bddc2053b4d020a1982c8bfb86dde5a88dc47be6;hpb=7c0ea176236eb4232303fbc60aabb2e0448a169f

diff --git a/libs/cbi/htdocs/luci-static/resources/cbi.js b/libs/cbi/htdocs/luci-static/resources/cbi.js
index 24f929c9b..247228d22 100644
--- a/libs/cbi/htdocs/luci-static/resources/cbi.js
+++ b/libs/cbi/htdocs/luci-static/resources/cbi.js
@@ -15,6 +15,7 @@
 
 var cbi_d = [];
 var cbi_t = [];
+var cbi_c = [];
 
 function cbi_d_add(field, dep, next) {
 	var obj = document.getElementById(field);
@@ -44,7 +45,18 @@ function cbi_d_checkvalue(target, ref) {
 	var t = document.getElementById(target);
 	var value;
 
-	if (!t || !t.value) {
+	if (!t) {
+		var tl = document.getElementsByName(target);
+
+		if( tl.length > 0 && tl[0].type == 'radio' )
+			for( var i = 0; i < tl.length; i++ )
+				if( tl[i].checked ) {
+					value = tl[i].value;
+					break;
+				}
+
+		value = value ? value : "";
+	} else if (!t.value) {
 		value = "";
 	} else {
 		value = t.value;
@@ -58,15 +70,26 @@ function cbi_d_checkvalue(target, ref) {
 }
 
 function cbi_d_check(deps) {
+	var reverse;
+	var def = false;
 	for (var i=0; i<deps.length; i++) {
-		var istat = true
+		var istat = true;
+		reverse = false;
 		for (var j in deps[i]) {
-			istat = (istat && cbi_d_checkvalue(j, deps[i][j]))
+			if (j == "!reverse") {
+				reverse = true;
+			} else if (j == "!default") {
+				def = true;
+				istat = false;
+			} else {
+				istat = (istat && cbi_d_checkvalue(j, deps[i][j]))
+			}
 		}
 		if (istat) {
-			return true
+			return !reverse;
 		}
 	}
+	return def;
 }
 
 function cbi_d_update() {
@@ -79,16 +102,25 @@ function cbi_d_update() {
 
 		if (node && node.parentNode && !cbi_d_check(entry.deps)) {
 			node.parentNode.removeChild(node);
-			state = (state || !node.parentNode)
+			state = true;
+			if( entry.parent )
+				cbi_c[entry.parent]--;
 		} 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))
+			state = true;
+			if( entry.parent )
+				cbi_c[entry.parent]++;
 		}
 	}
+
+	if (entry.parent) {
+		cbi_t_update();
+	}
+
 	if (state) {
 		cbi_d_update();
 	}
@@ -228,13 +260,14 @@ function cbi_t_add(section, tab) {
 
 	if( t && c ) {
 		cbi_t[section] = (cbi_t[section] || [ ]);
-		cbi_t[section][tab] = { 'tab': t, 'container': c };
+		cbi_t[section][tab] = { 'tab': t, 'container': c, 'cid': c.id };
 	}
 }
 
 function cbi_t_switch(section, tab) {
 	if( cbi_t[section] && cbi_t[section][tab] ) {
 		var o = cbi_t[section][tab];
+		var h = document.getElementById('tab.' + section);
 		for( var tid in cbi_t[section] ) {
 			var o2 = cbi_t[section][tid];
 			if( o.tab.id != o2.tab.id ) {
@@ -242,6 +275,7 @@ function cbi_t_switch(section, tab) {
 				o2.container.style.display = 'none';
 			}
 			else {
+				if(h) h.value = tab;
 				o2.tab.className = o2.tab.className.replace(/(^| )cbi-tab-disabled( |$)/, " cbi-tab ");
 				o2.container.style.display = 'block';
 			}
@@ -249,3 +283,19 @@ function cbi_t_switch(section, tab) {
 	}
 	return false
 }
+
+function cbi_t_update() {
+	for( var sid in cbi_t )
+		for( var tid in cbi_t[sid] )
+			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;
+				window.setTimeout(function() { t.className = t.className.replace(/ cbi-tab-highlighted/g, '') }, 750);
+				cbi_t[sid][tid].tab.className += ' cbi-tab-highlighted';
+			}
+}
+