From 230efd7729a71d8654cde788e23878d09d1fb6bd Mon Sep 17 00:00:00 2001
From: jkharrat <jaouher.kharrat@eqs.com>
Date: Sun, 25 Apr 2021 20:16:49 +0200
Subject: [PATCH] :arrow_up: Fix default selection of dropdown items v2.0.2

---
 Release/com.jk.weather.streamDeckPlugin       | Bin 61476 -> 61550 bytes
 Sources/com.jk.weather.sdPlugin/manifest.json |   2 +-
 Sources/com.jk.weather.sdPlugin/pi/main_pi.js |  88 ++++++-------
 .../com.jk.weather.sdPlugin/plugin/main.js    | 119 +++++++++---------
 4 files changed, 98 insertions(+), 111 deletions(-)

diff --git a/Release/com.jk.weather.streamDeckPlugin b/Release/com.jk.weather.streamDeckPlugin
index 428b5d053003322f8703c47b5d98739ece600ede..acd5bd28071381c56c01c2bb7fb95eab56a3dd3e 100644
GIT binary patch
delta 3276
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

delta 3194
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
JW94UR{{h~Moo4_5

diff --git a/Sources/com.jk.weather.sdPlugin/manifest.json b/Sources/com.jk.weather.sdPlugin/manifest.json
index 5af317e..a99067c 100644
--- a/Sources/com.jk.weather.sdPlugin/manifest.json
+++ b/Sources/com.jk.weather.sdPlugin/manifest.json
@@ -23,7 +23,7 @@
     "Icon": "resources/pluginIcon", 
     "PropertyInspectorPath": "pi/main_pi.html",
     "URL": "https://github.com/JaouherK",
-    "Version": "2.0.1",
+    "Version": "2.0.2",
     "OS": [
       {
           "Platform": "mac", 
diff --git a/Sources/com.jk.weather.sdPlugin/pi/main_pi.js b/Sources/com.jk.weather.sdPlugin/pi/main_pi.js
index 9476a90..707d5d3 100644
--- a/Sources/com.jk.weather.sdPlugin/pi/main_pi.js
+++ b/Sources/com.jk.weather.sdPlugin/pi/main_pi.js
@@ -7,26 +7,25 @@ function connectElgatoStreamDeckSocket(inPort, inPropertyInspectorUUID, inRegist
     uuid = inPropertyInspectorUUID;
     actionInfo = JSON.parse(inActionInfo);
 
-    websocket = new WebSocket('ws://localhost:' + inPort);
+    websocket = new WebSocket("ws://localhost:" + inPort);
 
-    websocket.onopen = function()
-    {
+    websocket.onopen = function () {
         // WebSocket is connected, register the Property Inspector
         let json = {
-            "event": inRegisterEvent,
-            "uuid": inPropertyInspectorUUID
+            event: inRegisterEvent,
+            uuid: inPropertyInspectorUUID
         };
         websocket.send(JSON.stringify(json));
 
         json = {
-            "event": "getSettings",
-            "context": uuid,
+            event: "getSettings",
+            context: uuid,
         };
         websocket.send(JSON.stringify(json));
 
         json = {
-            "event": "getGlobalSettings",
-            "context": uuid,
+            event: "getGlobalSettings",
+            context: uuid,
         };
         websocket.send(JSON.stringify(json));
     };
@@ -34,53 +33,40 @@ function connectElgatoStreamDeckSocket(inPort, inPropertyInspectorUUID, inRegist
     websocket.onmessage = function (evt) {
         // Received message from Stream Deck
         const jsonObj = JSON.parse(evt.data);
-        if (jsonObj.event === 'didReceiveSettings') {
+        if (jsonObj.event === "didReceiveSettings") {
             const payload = jsonObj.payload.settings;
-
-            document.getElementById('cityName').value = payload.cityName;
-
-            if(document.getElementById('cityName').value === "undefined") {
-                document.getElementById('cityName').value = "";
-            }
-
-            document.getElementById('frequency').value = payload.frequency;
-
-            if(document.getElementById('frequency').value === "undefined") {
-                document.getElementById('frequency').value = "0";
-            }
-
-            document.getElementById('unit').value = payload.unit;
-
-            if(document.getElementById('unit').value === "undefined") {
-                document.getElementById('unit').value = "celsius";
-            }
+            initiateElement("cityName", payload.cityName);
+            initiateElement("frequency", payload.frequency, 0);
+            initiateElement("unit", payload.unit, "celsius");
         }
-        if (jsonObj.event === 'didReceiveGlobalSettings') {
+        if (jsonObj.event === "didReceiveGlobalSettings") {
             const payload = jsonObj.payload.settings;
-
-            document.getElementById('apiKey').value = payload.apiKey;
-
-            if(document.getElementById('apiKey').value === "undefined") {
-                document.getElementById('apiKey').value = "";
-            }
-
-            const el = document.querySelector('.sdpi-wrapper');
-            el && el.classList.remove('hidden');
+            initiateElement("apiKey", payload.apiKey);
+            const el = document.querySelector(".sdpi-wrapper");
+            el && el.classList.remove("hidden");
         }
     };
 
 }
 
+function initiateElement(element, value, fallback = "") {
+    if (typeof value === 'undefined') {
+        document.getElementById(element).value = fallback;
+        return;
+    }
+    document.getElementById(element).value = value;
+}
+
 function updateSettings() {
     if (websocket && (websocket.readyState === 1)) {
         let payload = {};
-        payload.cityName = document.getElementById('cityName').value;
-        payload.frequency = document.getElementById('frequency').value;
-        payload.unit = document.getElementById('unit').value;
+        payload.cityName = document.getElementById("cityName").value;
+        payload.frequency = document.getElementById("frequency").value;
+        payload.unit = document.getElementById("unit").value;
         const json = {
-            "event": "setSettings",
-            "context": uuid,
-            "payload": payload
+            event: "setSettings",
+            context: uuid,
+            payload: payload
         };
         websocket.send(JSON.stringify(json));
     }
@@ -89,11 +75,11 @@ function updateSettings() {
 function updateApiKey() {
     if (websocket && (websocket.readyState === 1)) {
         let payload = {};
-        payload.apiKey = document.getElementById('apiKey').value;
+        payload.apiKey = document.getElementById("apiKey").value;
         const json = {
-            "event": "setGlobalSettings",
-            "context": uuid,
-            "payload": payload
+            event: "setGlobalSettings",
+            context: uuid,
+            payload
         };
         websocket.send(JSON.stringify(json));
     }
@@ -102,9 +88,9 @@ function updateApiKey() {
 function openPage(site) {
     if (websocket && (websocket.readyState === 1)) {
         const json = {
-            'event': 'openUrl',
-            'payload': {
-                'url': 'https://' + site
+            event: "openUrl",
+            payload: {
+                url: `https://${site}`
             }
         };
         websocket.send(JSON.stringify(json));
diff --git a/Sources/com.jk.weather.sdPlugin/plugin/main.js b/Sources/com.jk.weather.sdPlugin/plugin/main.js
index a3d3731..a001144 100644
--- a/Sources/com.jk.weather.sdPlugin/plugin/main.js
+++ b/Sources/com.jk.weather.sdPlugin/plugin/main.js
@@ -11,8 +11,8 @@ function connectElgatoStreamDeckSocket(inPort, inPluginUUID, inRegisterEvent, in
     websocket.onopen = function () {
         // WebSocket is connected, register the plugin
         const json = {
-            "event": inRegisterEvent,
-            "uuid": inPluginUUID
+            event: inRegisterEvent,
+            uuid: inPluginUUID
         };
 
         websocket.send(JSON.stringify(json));
@@ -21,17 +21,17 @@ function connectElgatoStreamDeckSocket(inPort, inPluginUUID, inRegisterEvent, in
     websocket.onmessage = function (evt) {
         // Received message from Stream Deck
         const jsonObj = JSON.parse(evt.data);
-        const context = jsonObj['context'];
+        const context = jsonObj["context"];
 
-        if (jsonObj['event'] === "keyUp") {
+        if (jsonObj["event"] === "keyUp") {
             let cityName = "";
             let unit = "";
             let frequency = null;
             if (
                 jsonObj.payload.settings != null &&
-                jsonObj.payload.settings.hasOwnProperty('cityName') &&
-                jsonObj.payload.settings.hasOwnProperty('unit') &&
-                jsonObj.payload.settings.hasOwnProperty('frequency')
+                jsonObj.payload.settings.hasOwnProperty("cityName") &&
+                jsonObj.payload.settings.hasOwnProperty("unit") &&
+                jsonObj.payload.settings.hasOwnProperty("frequency")
             ) {
                 cityName = jsonObj.payload.settings["cityName"].toLowerCase();
                 unit = jsonObj.payload.settings["unit"];
@@ -40,8 +40,8 @@ function connectElgatoStreamDeckSocket(inPort, inPluginUUID, inRegisterEvent, in
 
             if (cityName === "" || apiKey === "") {
                 const json = {
-                    "event": "showAlert",
-                    "context": jsonObj.context,
+                    event: "showAlert",
+                    context: jsonObj.context,
                 };
                 websocket.send(JSON.stringify(json));
             } else {
@@ -50,15 +50,15 @@ function connectElgatoStreamDeckSocket(inPort, inPluginUUID, inRegisterEvent, in
                     setInterval(() => requestSending(context, cityName, unit), frequency);
                 }
             }
-        } else if (jsonObj['event'] === "didReceiveGlobalSettings") {
-            if (jsonObj.payload.settings != null && jsonObj.payload.settings.hasOwnProperty('apiKey')) {
+        } else if (jsonObj["event"] === "didReceiveGlobalSettings") {
+            if (jsonObj.payload.settings != null && jsonObj.payload.settings.hasOwnProperty("apiKey")) {
                 apiKey = jsonObj.payload.settings["apiKey"];
             }
 
-        } else if (jsonObj['event'] === "keyDown") {
+        } else if (jsonObj["event"] === "keyDown") {
             const json = {
-                "event": "getGlobalSettings",
-                "context": pluginUUID
+                event: "getGlobalSettings",
+                context: pluginUUID
             };
 
             websocket.send(JSON.stringify(json));
@@ -69,76 +69,77 @@ function connectElgatoStreamDeckSocket(inPort, inPluginUUID, inRegisterEvent, in
 
 function requestSending(context, cityName, unit) {
     const request = new XMLHttpRequest();
-    request.open("GET", 'https://api.weatherapi.com/v1/current.json?key=' + apiKey + '&q=' + cityName + '&aqi=no');
+    request.open("GET", "https://api.weatherapi.com/v1/current.json?key=" + apiKey + "&q=" + cityName + "&aqi=no");
     request.send();
     request.onreadystatechange = function () {
         if (request.readyState === XMLHttpRequest.DONE) {
             if (request.status === 200) {
                 const response = JSON.parse(request.responseText);
                 let temperature = "";
-                if (unit === 'celsius') {
+                if (unit === "celsius") {
                     temperature = response.current.temp_c ? response.current.temp_c + "°C" : "NaN";
                 }
-                if (unit === 'fahrenheit') {
+                if (unit === "fahrenheit") {
                     temperature = response.current.temp_f ? response.current.temp_f + "°F" : "NaN";
                 }
-                let json = {
-                    "event": "setTitle",
-                    "context": context,
-                    "payload": {
-                        "title": "" + temperature,
-                        "target": 1
+                let jsonDeck = {
+                    event: "setTitle",
+                    context,
+                    payload: {
+                        title: temperature,
+                        target: 1
                     }
                 };
 
-                websocket.send(JSON.stringify(json));
+                websocket.send(JSON.stringify(jsonDeck));
 
-                let json2 = {
-                    "event": "setTitle",
-                    "context": context,
-                    "payload": {
-                        "title": "" + cityName,
-                        "target": 2
+                let jsonSoftware = {
+                    event: "setTitle",
+                    context: context,
+                    payload: {
+                        title: cityName,
+                        target: 2
                     }
                 };
 
-                websocket.send(JSON.stringify(json2));
-
-                function toDataURL(url, callback) {
-                    let xhr = new XMLHttpRequest();
-                    xhr.onload = function () {
-                        let reader = new FileReader();
-                        reader.onloadend = function () {
-                            callback(reader.result);
-                        }
-                        reader.readAsDataURL(xhr.response);
-                    };
-                    xhr.open('GET', url);
-                    xhr.responseType = 'blob';
-                    xhr.send();
-                }
+                websocket.send(JSON.stringify(jsonSoftware));
 
                 if (response.current.condition.icon != null) {
-                    toDataURL("https:" + response.current.condition.icon, function (dataUrl) {
-                        let json = {
-                            "event": "setImage",
-                            "context": context,
-                            "payload": {
-                                "image": '' + dataUrl,
-                                "target": 1
-                            }
-                        };
-
-                        websocket.send(JSON.stringify(json));
-                    })
+                    toDataURL(
+                        "https:" + response.current.condition.icon,
+                        (dataUrl) => {
+                            let json = {
+                                event: "setImage",
+                                context,
+                                payload: {
+                                    image: dataUrl,
+                                    target: 1
+                                }
+                            };
+                            websocket.send(JSON.stringify(json));
+                        })
                 }
             } else {
                 const json = {
-                    "event": "showAlert",
-                    "context": context,
+                    event: "showAlert",
+                    context,
                 };
                 websocket.send(JSON.stringify(json));
             }
         }
     }
 }
+
+function toDataURL(url, callback) {
+    let xhr = new XMLHttpRequest();
+    xhr.onload = function () {
+        let reader = new FileReader();
+        reader.onloadend = function () {
+            callback(reader.result);
+        }
+        reader.readAsDataURL(xhr.response);
+    };
+    xhr.open("GET", url);
+    xhr.responseType = "blob";
+    xhr.send();
+}