From c456a9c8d2f776e21bc98ba98041edfc4aaf8d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= Date: Sun, 29 Sep 2019 11:15:12 +0200 Subject: [PATCH] Simplify deviceID: this in service calls from frontend. --- js/main.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/js/main.js b/js/main.js index 456ee82..bc14151 100644 --- a/js/main.js +++ b/js/main.js @@ -14,9 +14,13 @@ class BrowserMod { const callService = hass.callService; const newCallService = (domain, service, serviceData) => { if(serviceData && serviceData.deviceID) { - const index = serviceData.deviceID.indexOf('this'); - if(index !== -1) - serviceData.deviceID[index] = deviceID; + if(Array.isArray(serviceData.deviceID)) { + const index = serviceData.deviceID.indexOf('this'); + if(index !== -1) + serviceData.deviceID[index] = deviceID; + } else if(serviceData.deviceID === "this") { + serviceData.deviceID = deviceID; + } } return callService(domain, service, serviceData); };