From aa12e53333b47800e85fcc2acc16b5c10af8a91f Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 18 Jan 2016 11:04:15 +0100
Subject: [PATCH] luci-base: add extra css class for map level tabs, don't
 track tab child count

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
---
 modules/luci-base/htdocs/luci-static/resources/cbi.js | 9 ++++++---
 modules/luci-base/luasrc/view/cbi/map.htm             | 3 +--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js
index 1c4123bda..15645d902 100644
--- a/modules/luci-base/htdocs/luci-static/resources/cbi.js
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js
@@ -475,7 +475,7 @@ function cbi_d_update() {
 		if (node && node.parentNode && !cbi_d_check(entry.deps)) {
 			node.parentNode.removeChild(node);
 			state = true;
-			if( entry.parent )
+			if( entry.parent && typeof(cbi_c[entry.parent]) == 'number')
 				cbi_c[entry.parent]--;
 		} else if ((!node || !node.parentNode) && cbi_d_check(entry.deps)) {
 			if (!next) {
@@ -484,7 +484,7 @@ function cbi_d_update() {
 				next.parentNode.insertBefore(entry.node, next);
 			}
 			state = true;
-			if( entry.parent )
+			if( entry.parent && typeof(cbi_c[entry.parent]) == 'number' )
 				cbi_c[entry.parent]++;
 		}
 	}
@@ -935,7 +935,10 @@ 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 ) {
+			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' ) {
diff --git a/modules/luci-base/luasrc/view/cbi/map.htm b/modules/luci-base/luasrc/view/cbi/map.htm
index 7f256adf1..48403f1c3 100644
--- a/modules/luci-base/luasrc/view/cbi/map.htm
+++ b/modules/luci-base/luasrc/view/cbi/map.htm
@@ -10,10 +10,9 @@
 	<%- if firstmap and applymap then cbi_apply_xhr(self.config, parsechain, redirect) end -%>
 
 	<% if self.tabbed then %>
-		<ul class="cbi-tabmenu">
+		<ul class="cbi-tabmenu map">
 			<%- self.selected_tab = luci.http.formvalue("tab.m-" .. self.config) %>
 			<% for i, section in ipairs(self.children) do %>
-				<script type="text/javascript">cbi_c['container.m-<%=self.config%>.<%=section.sectiontype%>'] = 1;</script>
 				<%- if not self.selected_tab then self.selected_tab = section.sectiontype end %>
 				<li id="tab.m-<%=self.config%>.<%=section.sectiontype%>" class="cbi-tab<%=(section.sectiontype == self.selected_tab) and '' or '-disabled'%>">
 					<a onclick="this.blur(); return cbi_t_switch('m-<%=self.config%>', '<%=section.sectiontype%>')" href="<%=REQUEST_URI%>?tab.m-<%=self.config%>=<%=section.sectiontype%>"><%=section.title or section.sectiontype %></a>
-- 
2.11.0