Merge pull request #1999 from BartS23/fixAlarm

Alarms with hidden: true are not filtered
master
Gordon Williams 2022-06-27 12:21:48 +01:00 committed by GitHub
commit c99c509e4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -31,4 +31,6 @@
0.29: Fix wrong 'dow' handling in new timer if first day of week is Monday 0.29: Fix wrong 'dow' handling in new timer if first day of week is Monday
0.30: Fix "Enable All" 0.30: Fix "Enable All"
0.31: Add seconds to timers 0.31: Add seconds to timers
0.32: Add option for auto-delete a timer after it expires 0.32: Fix wrong hidden filter
Add option for auto-delete a timer after it expires

View File

@ -2,7 +2,7 @@ WIDGETS["alarm"]={area:"tl",width:0,draw:function() {
if (this.width) g.reset().drawImage(atob("GBgBAAAAAAAAABgADhhwDDwwGP8YGf+YMf+MM//MM//MA//AA//AA//AA//AA//AA//AB//gD//wD//wAAAAADwAABgAAAAAAAAA"),this.x,this.y); if (this.width) g.reset().drawImage(atob("GBgBAAAAAAAAABgADhhwDDwwGP8YGf+YMf+MM//MM//MA//AA//AA//AA//AA//AA//AB//gD//wD//wAAAAADwAABgAAAAAAAAA"),this.x,this.y);
},reload:function() { },reload:function() {
// don't include library here as we're trying to use as little RAM as possible // don't include library here as we're trying to use as little RAM as possible
WIDGETS["alarm"].width = (require('Storage').readJSON('sched.json',1)||[]).some(alarm=>alarm.on&&(alarm.hidden!==false)) ? 24 : 0; WIDGETS["alarm"].width = (require('Storage').readJSON('sched.json',1)||[]).some(alarm=>alarm.on&&(alarm.hidden!==true)) ? 24 : 0;
} }
}; };
WIDGETS["alarm"].reload(); WIDGETS["alarm"].reload();