Skip to content

Commit

Permalink
v3.20.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@jemu75
jemu75 committed May 12, 2021
1 parent dcad4a3 commit f24710e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fhemapp",
"version": "3.20.0",
"version": "3.20.1",
"private": true,
"author": "jemu75",
"scripts": {
Expand Down
6 changes: 4 additions & 2 deletions src/plugins/fhem.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -731,6 +731,7 @@ class Fhem extends EventEmitter {
if(data.devicePart === 'Attributes' && this.getEl(source, 'Attributes', data.param)) {
source.Attributes[data.param] = data.value;
}

this.handleTemplate(source);
this.app.data.deviceList.splice(idx, 1, source);
this.app.data.deviceList.sort((a,b) => (a.Options.sortby > b.Options.sortby) ? 1 : ((b.Options.sortby > a.Options.sortby) ? -1 : 0));
Expand All @@ -748,7 +749,8 @@ class Fhem extends EventEmitter {
if(data.devicePart === 'Attributes' && this.getEl(source.Connected[alias], 'Attributes', data.param)) {
source.Connected[alias].Attributes[data.param] = data.value;
}
this.handleTemplate(source.Connected[alias]);

this.handleTemplate(source);
this.app.data.deviceList.splice(idx, 1, source);
this.app.data.deviceList.sort((a,b) => (a.Options.sortby > b.Options.sortby) ? 1 : ((b.Options.sortby > a.Options.sortby) ? -1 : 0));
}
Expand Down Expand Up @@ -795,7 +797,7 @@ class Fhem extends EventEmitter {

let meta = {
info: 'Connection (' + this.app.connection.type + ') ' + (evt ? 'failed.' : 'was closed.'),
errCode: evt.errCode || ''
errCode: evt || ''
};

this.log({ lvl: 2, msg: 'Connection with FHEM was closed. Try to Reconnect in ' + (msecs / 1000) + ' seconds...', meta: meta })
Expand Down
2 changes: 1 addition & 1 deletion www/fhemapp/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="favicon.png"><link rel="apple-touch-icon" href="apple-touch-icon.png"><title>fhemapp</title><link href="css/chunk-00f750ae.8853dffa.css" rel="prefetch"><link href="css/chunk-03454508.55c011d2.css" rel="prefetch"><link href="css/chunk-0c34425c.11195de6.css" rel="prefetch"><link href="css/chunk-12e7f05c.803d1e0c.css" rel="prefetch"><link href="css/chunk-1444c05b.460ac60a.css" rel="prefetch"><link href="css/chunk-15fa718e.55c011d2.css" rel="prefetch"><link href="css/chunk-28c4def2.9d7b53c6.css" rel="prefetch"><link href="css/chunk-325da004.d6669d5e.css" rel="prefetch"><link href="css/chunk-369d55e6.06c548e9.css" rel="prefetch"><link href="css/chunk-3ab9f3ab.11195de6.css" rel="prefetch"><link href="css/chunk-40496c8f.55f3049e.css" rel="prefetch"><link href="css/chunk-97aef864.ab3894ae.css" rel="prefetch"><link href="css/chunk-a3bdc2ee.24ee5340.css" rel="prefetch"><link href="js/chunk-00f750ae.7fc9b0ad.js" rel="prefetch"><link href="js/chunk-03454508.9df43ef6.js" rel="prefetch"><link href="js/chunk-0c34425c.b465d2d6.js" rel="prefetch"><link href="js/chunk-12e7f05c.7899c456.js" rel="prefetch"><link href="js/chunk-1444c05b.136b534d.js" rel="prefetch"><link href="js/chunk-15fa718e.4ae3c793.js" rel="prefetch"><link href="js/chunk-28c4def2.0e1dcb12.js" rel="prefetch"><link href="js/chunk-2d212bf1.233e9bdb.js" rel="prefetch"><link href="js/chunk-2d22937e.ea39b59a.js" rel="prefetch"><link href="js/chunk-2d22d812.4e2f5162.js" rel="prefetch"><link href="js/chunk-325da004.1d5d0347.js" rel="prefetch"><link href="js/chunk-369d55e6.a6d8f7e5.js" rel="prefetch"><link href="js/chunk-3ab9f3ab.fa42960e.js" rel="prefetch"><link href="js/chunk-40496c8f.3e98a56c.js" rel="prefetch"><link href="js/chunk-97aef864.ef2d1bc6.js" rel="prefetch"><link href="js/chunk-a3bdc2ee.0de04460.js" rel="prefetch"><link href="css/app.27c949a3.css" rel="preload" as="style"><link href="css/chunk-vendors.b3e40f08.css" rel="preload" as="style"><link href="js/app.51721ad2.js" rel="preload" as="script"><link href="js/chunk-vendors.6738628a.js" rel="preload" as="script"><link href="css/chunk-vendors.b3e40f08.css" rel="stylesheet"><link href="css/app.27c949a3.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.6738628a.js"></script><script src="js/app.51721ad2.js"></script></body></html>
<!DOCTYPE html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="favicon.png"><link rel="apple-touch-icon" href="apple-touch-icon.png"><title>fhemapp</title><link href="css/chunk-00f750ae.8853dffa.css" rel="prefetch"><link href="css/chunk-03454508.55c011d2.css" rel="prefetch"><link href="css/chunk-0c34425c.11195de6.css" rel="prefetch"><link href="css/chunk-12e7f05c.803d1e0c.css" rel="prefetch"><link href="css/chunk-1444c05b.460ac60a.css" rel="prefetch"><link href="css/chunk-15fa718e.55c011d2.css" rel="prefetch"><link href="css/chunk-28c4def2.9d7b53c6.css" rel="prefetch"><link href="css/chunk-325da004.d6669d5e.css" rel="prefetch"><link href="css/chunk-369d55e6.06c548e9.css" rel="prefetch"><link href="css/chunk-3ab9f3ab.11195de6.css" rel="prefetch"><link href="css/chunk-40496c8f.55f3049e.css" rel="prefetch"><link href="css/chunk-97aef864.ab3894ae.css" rel="prefetch"><link href="css/chunk-a3bdc2ee.24ee5340.css" rel="prefetch"><link href="js/chunk-00f750ae.7fc9b0ad.js" rel="prefetch"><link href="js/chunk-03454508.9df43ef6.js" rel="prefetch"><link href="js/chunk-0c34425c.b465d2d6.js" rel="prefetch"><link href="js/chunk-12e7f05c.7899c456.js" rel="prefetch"><link href="js/chunk-1444c05b.136b534d.js" rel="prefetch"><link href="js/chunk-15fa718e.4ae3c793.js" rel="prefetch"><link href="js/chunk-28c4def2.0e1dcb12.js" rel="prefetch"><link href="js/chunk-2d212bf1.233e9bdb.js" rel="prefetch"><link href="js/chunk-2d22937e.ea39b59a.js" rel="prefetch"><link href="js/chunk-2d22d812.4e2f5162.js" rel="prefetch"><link href="js/chunk-325da004.1d5d0347.js" rel="prefetch"><link href="js/chunk-369d55e6.a6d8f7e5.js" rel="prefetch"><link href="js/chunk-3ab9f3ab.fa42960e.js" rel="prefetch"><link href="js/chunk-40496c8f.3e98a56c.js" rel="prefetch"><link href="js/chunk-97aef864.ef2d1bc6.js" rel="prefetch"><link href="js/chunk-a3bdc2ee.0de04460.js" rel="prefetch"><link href="css/app.27c949a3.css" rel="preload" as="style"><link href="css/chunk-vendors.b3e40f08.css" rel="preload" as="style"><link href="js/app.a5ce73d0.js" rel="preload" as="script"><link href="js/chunk-vendors.6738628a.js" rel="preload" as="script"><link href="css/chunk-vendors.b3e40f08.css" rel="stylesheet"><link href="css/app.27c949a3.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.6738628a.js"></script><script src="js/app.a5ce73d0.js"></script></body></html>
2 changes: 1 addition & 1 deletion www/fhemapp/js/app.51721ad2.js → www/fhemapp/js/app.a5ce73d0.js
View file

Large diffs are not rendered by default.

0 comments on commit f24710e

Please sign in to comment.