From ec05fecd87ec6ecb8f43ade1f1d7c72c32b50d20 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Sat, 1 May 2021 10:05:24 +0000
Subject: [PATCH] fhemweb.js: add help for regexp attributeNames (Forum
 #120779)

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@24366 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 www/pgm2/fhemweb.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/www/pgm2/fhemweb.js b/www/pgm2/fhemweb.js
index 32e546775..29b6aa3e0 100644
--- a/www/pgm2/fhemweb.js
+++ b/www/pgm2/fhemweb.js
@@ -346,15 +346,15 @@ FW_displayHelp(devName, sel, selType, val, level)
     if(level == 3) // commandref
       mtype = "";
 
-    if(mtype) {           // old style #1 syntax: MODULETYPEattrname
+    if(mtype) {             // current syntax: FHEMWEB-attr-webCmd
       var mv = (""+mtype+"-"+selType+"-"+val).replace(/[^a-z0-9_-]/ig,'_');
       aTag = $("#content > #workbench").find("a[id="+mv+"]");
-      if(!$(aTag).length) {
+      if(!$(aTag).length) { // old style #1 syntax: FHEMWEBwebCmd
         mv = (""+mtype+val).replace(/[^a-z0-9_-]/ig,'_');
         aTag = $("#content > #workbench").find("a[name="+mv+"]");
       }
     }
-    if(!$(aTag).length) { // old style #2 syntax without type
+    if(!$(aTag).length) { // old style #2 syntax : webCmd
       var v = (val).replace(/[^a-z0-9_-]/ig,'_');
       aTag = $("#content > #workbench").find("a[name="+v+"]");
     }
@@ -374,10 +374,15 @@ FW_displayHelp(devName, sel, selType, val, level)
     $("#content > #workbench").remove();
 
     if(!$(aTag).length) {
-      if(devName != "FHEMWEB" && level == 1)
-        return FW_displayHelp("FHEMWEB", sel, selType, val, 2);
-      if(devName != "commandref" && level < 3)
-        return FW_displayHelp("commandref", sel, selType, val, 3);
+      var ma = val.match(/(.*?)[0-9]+$/);
+      while(++level <= 4) {
+        if(level == 2 && ma)
+          return FW_displayHelp(devName, sel, selType, ma[1], level);
+        if(level == 3 && devName != "FHEMWEB")
+          return FW_displayHelp("FHEMWEB", sel, selType, val, level);
+        if(level == 4 && devName != "commandref")
+          return FW_displayHelp("commandref", sel, selType, val, level);
+      }
     }
   });
 }