Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fhemweb.js: add data-pattern from Thorsten for regexp attributes (Forum #120779)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@24371 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2021-05-02 08:50:19 +00:00
parent 78fd7a5a30
commit 3294f200fc
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
www/pgm2/fhemweb.js
View File

@ -338,25 +338,34 @@ FW_displayHelp(devName, sel, selType, val, level)
FW_getHelp(devName, function(data) { // show either the next or the outer li FW_getHelp(devName, function(data) { // show either the next or the outer li
$("#content") $("#content")
.append("<div id='workbench' style='display:none'></div>"); .append("<div id='workbench' style='display:none'></div>");
$("#content > #workbench").html(data); var wb = $("#content > #workbench");
wb.html(data);
var mtype = $("#content > #workbench a[id]").attr("id"), aTag; var mtype = wb.find("a[id]").attr("id"), aTag;
if(!mtype) if(!mtype)
mtype = $("#content > #workbench a[name]").attr("name"); mtype = wb.find("a[name]").attr("name");
if(level == 3) // commandref if(level == 3) // commandref
mtype = ""; mtype = "";
if(mtype) { // current syntax: FHEMWEB-attr-webCmd if(mtype) { // current syntax: FHEMWEB-attr-webCmd
var mv = (""+mtype+"-"+selType+"-"+val).replace(/[^a-z0-9_-]/ig,'_'); var mv = (""+mtype+"-"+selType+"-"+val).replace(/[^a-z0-9_-]/ig,'_');
aTag = $("#content > #workbench").find("a[id="+mv+"]"); aTag = wb.find("a[id="+mv+"]");
if(!$(aTag).length) { // old style #1 syntax: FHEMWEBwebCmd if(!$(aTag).length) { // old style #1 syntax: FHEMWEBwebCmd
mv = (""+mtype+val).replace(/[^a-z0-9_-]/ig,'_'); mv = (""+mtype+val).replace(/[^a-z0-9_-]/ig,'_');
aTag = $("#content > #workbench").find("a[name="+mv+"]"); aTag = wb.find("a[name="+mv+"]");
} }
} }
if(!$(aTag).length) { // old style #2 syntax : webCmd if(!$(aTag).length) { // old style #2 syntax : webCmd
var v = (val).replace(/[^a-z0-9_-]/ig,'_'); var v = (val).replace(/[^a-z0-9_-]/ig,'_');
aTag = $("#content > #workbench").find("a[name="+v+"]"); aTag = wb.find("a[name="+v+"]");
}
if(!$(aTag).length) { // regexp attributes, like backend_.*
wb.find("a[id^='"+mtype+"-"+selType+"-'][data-pattern]").each(
function() {
if(val.match($(this).attr("data-pattern")))
aTag = this;
});
} }
if($(aTag).length) { if($(aTag).length) {
@ -371,16 +380,13 @@ FW_displayHelp(devName, sel, selType, val, level)
$("#devSpecHelp").html($(liTag).html()); $("#devSpecHelp").html($(liTag).html());
} }
} }
$("#content > #workbench").remove(); wb.remove();
if(!$(aTag).length) { if(!$(aTag).length) {
var ma = val.match(/(.*?)[\\.*0-9]+$/); while(++level <= 3) {
while(++level <= 4) { if(level == 2 && devName != "FHEMWEB")
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); return FW_displayHelp("FHEMWEB", sel, selType, val, level);
if(level == 4 && devName != "commandref") if(level == 3 && devName != "commandref")
return FW_displayHelp("commandref", sel, selType, val, level); return FW_displayHelp("commandref", sel, selType, val, level);
} }
} }