From c4d2e3498a9dce7c898da631ddd9ecab85488205 Mon Sep 17 00:00:00 2001 From: smathis Date: Wed, 2 Sep 2026 11:20:05 +0200 Subject: [PATCH] Changed the tab IDs to a sanitized version of the tab labels --- pages/Mudas.js | 71 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 20 deletions(-) diff --git a/pages/Mudas.js b/pages/Mudas.js index b44dd1f..827def6 100644 --- a/pages/Mudas.js +++ b/pages/Mudas.js @@ -218,41 +218,72 @@ function fillODBs() { // This function fills the tabs according to the init file // The tabs should be defined in instrTabs ([INSTR]init.js) function fillTabs() { - // create two containers + + // Convert the tab label into a suitable HTML ID + function makeTabId(label) { + return label.replace(/[^a-zA-Z0-9_-]/g, ""); + } + + // Create two containers let tabBtns = document.getElementById("tabBtns"); let tabMenu = document.getElementById("tabMenu"); let tabFrames = document.getElementById("tabFrames"); let beforeMenu = document.getElementById("beforeMenu"); let HIPA = document.getElementById("100"); - // tab counter - let iTab=0; + + // Tab counter + let iTab = 0; + for (let key in instrTabs) { - iTab++; + + iTab++; + + // Create tab content container let d = document.createElement("div"); d.id = "Tab" + iTab; d.className = "tabcontent"; - let f = ""; - d.innerHTML= f; + + let f = + ""; + + d.innerHTML = f; + + // Create tab button let b = document.createElement("button"); + if (instrTabs[key].style == "Menu") { b = document.createElement("a"); - } - b.id = iTab; - b.className = "w3-bar-item w3-button w3-round"; - b.setAttribute("onclick","openTab(event,this.id);" + instrTabs[key].addFunc); - b.innerHTML = "" + instrTabs[key].label + ""; - //b.onload = "openTab(event,this.id);" + instrTabs[key].addFunc; - - // Append elements - if (instrTabs[key].style == "Tab") { - tabBtns.insertBefore(b,beforeMenu); - } else { - tabMenu.insertBefore(b,HIPA); - } - tabFrames.appendChild(d); + } + + // Use a readable ID based on the label + b.id = makeTabId(instrTabs[key].label); + + // Keep the original numeric tab number for openTab() + b.dataset.tab = iTab; + + b.className = "w3-bar-item w3-button w3-round"; + + b.setAttribute( + "onclick", + "openTab(event,this.dataset.tab);" + instrTabs[key].addFunc + ); + + b.innerHTML = "" + instrTabs[key].label + ""; + + // Append elements + if (instrTabs[key].style == "Tab") { + tabBtns.insertBefore(b, beforeMenu); + } else { + tabMenu.insertBefore(b, HIPA); + } + + tabFrames.appendChild(d); } } + // This function checks for triggered alarms and add them to Mudas function triggerAlarms() { mjsonrpc_db_get_values(["/Alarms"]).then(function(rpc) {