thomas/lovelace-auto-entities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix sorting. Should fix #1. Should fix #4

Browse Source
This commit is contained in:
Thomas Lovén 2019-02-12 10:43:52 +01:00
parent b86cf34492
commit 1d85a8bc06
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
auto-entities.js
View File

@ -21,7 +21,8 @@ class AutoEntities extends cardTools.litElement() {
var regex = new RegExp(pattern.substr(1).slice(0,-1)); var regex = new RegExp(pattern.substr(1).slice(0,-1));
return regex.test(str); return regex.test(str);
} }
} else if(typeof(pattern) === "string") { }
if(typeof(pattern) === "string") {
if(pattern.indexOf(":") !== -1 && typeof(str) === "object") { if(pattern.indexOf(":") !== -1 && typeof(str) === "object") {
while(pattern.indexOf(":") !== -1) while(pattern.indexOf(":") !== -1)
{ {
@ -29,12 +30,12 @@ class AutoEntities extends cardTools.litElement() {
pattern = pattern.substr(pattern.indexOf(":")+1, pattern.length); pattern = pattern.substr(pattern.indexOf(":")+1, pattern.length);
} }
} }
if(pattern.startsWith("<=")) return str <= parseFloat(pattern.substr(2)); if(pattern.startsWith("<=")) return parseFloat(str) <= parseFloat(pattern.substr(2));
if(pattern.startsWith(">=")) return str >= parseFloat(pattern.substr(2)); if(pattern.startsWith(">=")) return parseFloat(str) >= parseFloat(pattern.substr(2));
if(pattern.startsWith("<")) return str < parseFloat(pattern.substr(1)); if(pattern.startsWith("<")) return parseFloat(str) < parseFloat(pattern.substr(1));
if(pattern.startsWith(">")) return str > parseFloat(pattern.substr(1)); if(pattern.startsWith(">")) return parseFloat(str) > parseFloat(pattern.substr(1));
if(pattern.startsWith("!")) return str != parseFloat(pattern.substr(1)); if(pattern.startsWith("!")) return parseFloat(str) != parseFloat(pattern.substr(1));
if(pattern.startsWith("=")) return str == parseFloat(pattern.substr(1)); if(pattern.startsWith("=")) return parseFloat(str) == parseFloat(pattern.substr(1));
} }
return str === pattern; return str === pattern;
} }