FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

doif.js: tolerate dots in element-id, cleanup

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@24438 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Ellert 2021-05-14 18:08:18 +00:00
parent f0052b65b1
commit 1ca4ac0a2d
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- change: doif.js: tolerate dots in element id, cleanup
- feature: 89_FULLY: Implemented some new commands - feature: 89_FULLY: Implemented some new commands
- bugfix: 98_serviced: interval not starting after FHEM start - bugfix: 98_serviced: interval not starting after FHEM start
- feature: 98_serviced: add attr disabledForIntervals - feature: 98_serviced: add attr disabledForIntervals

18
fhem/www/pgm2/doif.js
View File

@ -13,16 +13,6 @@ function doifUpdateCell(doifname,attrname,attrcont,content,style) {
}); });
} }
/*function doifUpdateIconColor(doifname,doifid,fillcolor) {
$("table[uitabid='DOIF-"+doifname+"']").find("svg."+doifid).each(function() {
if(fillcolor.length>0) {
var html = $(this).html().replace(/fill=\".*?\"/gi,'fill="'+fillcolor+'"')
.replace(/fill:.*?[;\s]/gi,'fill:'+fillcolor+';');
$(this).html(html);
}
});
}*/
function doifTablePopUp(hash,name,doif,table) { function doifTablePopUp(hash,name,doif,table) {
FW_cmd(FW_root+"?cmd={DOIF_RegisterEvalAll(\$defs{"+name+"},\""+name+"\",\""+table+"\")}&XHR=1", function(data){ FW_cmd(FW_root+"?cmd={DOIF_RegisterEvalAll(\$defs{"+name+"},\""+name+"\",\""+table+"\")}&XHR=1", function(data){
var uit = $("[uitabid='DOIF-"+doif+"']"); var uit = $("[uitabid='DOIF-"+doif+"']");
@ -52,11 +42,13 @@ $(window).ready(function(){
} }
if(room !== undefined && nodl !== undefined && nodl != "") { if(room !== undefined && nodl !== undefined && nodl != "") {
var re1 = new RegExp(nodl); var re1 = new RegExp(nodl);
if (room !="all" && room.match(re1)) if (room !="all" && room.match(re1)) {
$('#'+uitabid).closest('tr').css('display','none'); var rem = document.getElementById(uitabid);
$(rem).closest('tr').css('display','none');
}
} }
if($(this).attr("doifnostate") == 1) { if($(this).attr("doifnostate") == 1) {
$('#'+uitabid).remove(); document.getElementById(uitabid).remove();
} }
}); });
}); });