luci-theme-openwrt-2020: rework menu rendering

Utilize the LuCI.ui.menu class to load, traverse and cache the menu tree
in the local session store.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

2 files changed, 3 insertions, 169 deletions

diff --git a/themes/luci-theme-openwrt-2020/luasrc/view/themes/openwrt2020/footer.htm b/themes/luci-theme-openwrt-2020/luasrc/view/themes/openwrt2020/footer.htm
index 07be0d65a3..e9122f0b5c 100644
--- a/themes/luci-theme-openwrt-2020/luasrc/view/themes/openwrt2020/footer.htm
+++ b/themes/luci-theme-openwrt-2020/luasrc/view/themes/openwrt2020/footer.htm
@@ -3,7 +3,6 @@
  Licensed to the public under the Apache License 2.0.
 -%>
 
-<div class="clear"></div>
 </div>
 </div>
 
@@ -12,5 +11,7 @@
 	Powered by <%= ver.luciname %> (<%= ver.luciversion %>)
 </p>
 
+<script type="text/javascript">L.require('menu-openwrt2020')</script>
+
 </body>
 </html>
diff --git a/themes/luci-theme-openwrt-2020/luasrc/view/themes/openwrt2020/header.htm b/themes/luci-theme-openwrt-2020/luasrc/view/themes/openwrt2020/header.htm
index 0ebd6a9a9e..2025b67ed0 100644
--- a/themes/luci-theme-openwrt-2020/luasrc/view/themes/openwrt2020/header.htm
+++ b/themes/luci-theme-openwrt-2020/luasrc/view/themes/openwrt2020/header.htm
@@ -27,171 +27,6 @@
 <link rel="icon" href="<%=media%>/favicon.png" type="image/svg+xml" />
 <script type="text/javascript" src="<%=url('admin/translations', luci.i18n.context.lang)%><%# ?v=PKG_VERSION %>"></script>
 <script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript">//<![CDATA[
-	(function() {
-		function get_children(node) {
-			var children = [];
-
-			for (var k in node.children) {
-				if (!node.children.hasOwnProperty(k))
-					continue;
-
-				if (!node.children[k].satisfied)
-					continue;
-
-				if (!node.children[k].hasOwnProperty('title'))
-					continue;
-
-				children.push(Object.assign(node.children[k], { name: k }));
-			}
-
-			return children.sort(function(a, b) {
-				return ((a.order || 1000) - (b.order || 1000));
-			});
-		}
-
-		function handle_mainmenu_expand(ev) {
-			var a = ev.target, ul1 = a.parentNode.parentNode, ul2 = a.nextElementSibling;
-
-			document.querySelectorAll('ul.mainmenu.l1 > li.active').forEach(function(li) {
-				if (li !== a.parentNode)
-					li.classList.remove('active');
-			});
-
-			if (!ul2)
-				return;
-
-			if (ul2.parentNode.offsetLeft + ul2.offsetWidth <= ul1.offsetLeft + ul1.offsetWidth)
-				ul2.classList.add('align-left');
-
-			ul1.classList.add('active');
-			a.parentNode.classList.add('active');
-			a.blur();
-
-			ev.preventDefault();
-			ev.stopPropagation();
-		}
-
-		function render_mainmenu(tree, url, level) {
-			var l = (level || 0) + 1,
-			    ul = E('ul', { 'class': 'mainmenu l%d'.format(l) }),
-			    children = get_children(tree);
-
-			if (children.length == 0 || l > 2)
-				return E([]);
-
-			for (var i = 0; i < children.length; i++) {
-				var isActive = (L.env.dispatchpath[l] == children[i].name),
-				    activeClass = 'mainmenu-item-%s%s'.format(children[i].name, isActive ? ' selected' : '');
-
-				ul.appendChild(E('li', { 'class': activeClass }, [
-					E('a', {
-						'href': L.url(url, children[i].name),
-						'click': (l == 1) ? handle_mainmenu_expand : null,
-					}, [ _(children[i].title) ]),
-					render_mainmenu(children[i], url + '/' + children[i].name, l)
-				]));
-			}
-
-			if (l == 1) {
-				var container = document.querySelector('#mainmenu');
-
-				container.firstElementChild.appendChild(ul);
-				container.style.display = '';
-			}
-
-			return ul;
-		}
-
-		function render_modemenu(tree) {
-			var menu = document.querySelector('#modemenu'),
-			    children = get_children(tree);
-
-			for (var i = 0; i < children.length; i++) {
-				var isActive = (L.env.requestpath.length ? children[i].name == L.env.requestpath[0] : i == 0);
-
-				if (i > 0)
-					menu.appendChild(E([], ['\u00a0|\u00a0']));
-
-				menu.appendChild(E('div', { 'class': isActive ? 'active' : null }, [
-					E('a', { 'href': L.url(children[i].name) }, [ _(children[i].title) ])
-				]));
-
-				if (isActive)
-					render_mainmenu(children[i], children[i].name);
-			}
-
-			if (menu.children.length > 1)
-				menu.style.display = '';
-		}
-
-		function render_tabmenu(tree, url, level) {
-			var container = document.querySelector('#tabmenu'),
-			    l = (level || 0) + 1,
-			    ul = E('ul', { 'class': 'cbi-tabmenu' }),
-			    children = get_children(tree),
-			    activeNode = null;
-
-			if (children.length == 0)
-				return E([]);
-
-			for (var i = 0; i < children.length; i++) {
-				var isActive = (L.env.dispatchpath[l + 2] == children[i].name),
-				    activeClass = isActive ? ' cbi-tab' : '',
-				    className = 'tabmenu-item-%s %s'.format(children[i].name, activeClass);
-
-				ul.appendChild(E('li', { 'class': className }, [
-					E('a', { 'href': L.url(url, children[i].name) }, [ _(children[i].title) ] )
-				]));
-
-				if (isActive)
-					activeNode = children[i];
-			}
-
-			container.appendChild(ul);
-			container.style.display = '';
-
-			if (activeNode)
-				container.appendChild(render_tabmenu(activeNode, url + '/' + activeNode.name, l));
-
-			return ul;
-		}
-
-		function toggle_sidebar(ev) {
-			var btn = ev.currentTarget,
-			    bar = document.querySelector('#mainmenu');
-
-			if (btn.classList.contains('active')) {
-				btn.classList.remove('active');
-				bar.classList.remove('active');
-			}
-			else {
-				btn.classList.add('active');
-				bar.classList.add('active');
-			}
-		}
-
-		document.addEventListener('luci-loaded', function(ev) {
-			var tree = <%= luci.http.write_json(luci.dispatcher.menu_json() or {}) %>,
-			    node = tree,
-			    url = '';
-
-			render_modemenu(tree);
-
-			if (L.env.dispatchpath.length >= 3) {
-				for (var i = 0; i < 3 && node; i++) {
-					node = node.children[L.env.dispatchpath[i]];
-					url = url + (url ? '/' : '') + L.env.dispatchpath[i];
-				}
-
-				if (node)
-					render_tabmenu(node, url);
-			}
-
-			document.querySelector('#menubar > .navigation').addEventListener('click', toggle_sidebar);
-		});
-	})();
-//]]></script>
 <title><%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
 </head>
 <body class="lang_<%=luci.i18n.context.lang%>" data-page="<%= pcdata(path) %>">
@@ -212,9 +47,7 @@
 <div id="modemenu" style="display:none"></div>
 
 <div id="maincontainer">
-	<div id="mainmenu" style="display:none">
-		<div></div>
-	</div>
+	<div id="mainmenu"></div>
 
 	<div id="maincontent">
 		<%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") and category ~= "failsafe" and path ~= "admin-system-admin-password" then -%>