From 7eff0a6a1af29caa7f24da2906b83366343ac67a Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Tue, 23 Aug 2022 02:00:35 +0200
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D1=8F=D0=B5=D0=BC=20=D0=B1=D0=B0=D0=B3=20=D0=BE=D0=BA=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=B2=D0=B2=D0=BE=D0=B4=D0=B0=20=D1=81=D1=86=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=D1=80=D0=B8=D0=B5=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 others/inputjson.svelte | 7 +++++++
 public/index.html       | 2 +-
 src/App.svelte          | 3 ++-
 src/pages/Config.svelte | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 others/inputjson.svelte

diff --git a/others/inputjson.svelte b/others/inputjson.svelte
new file mode 100644
index 0000000..c8bb099
--- /dev/null
+++ b/others/inputjson.svelte
@@ -0,0 +1,7 @@
+{#if showWidjetJson}
+  <Card title="Редактор JSON">
+    <textarea rows="10" class="text-sm w-full" id="text1"
+      >{syntaxHighlight(JSON.stringify(layoutJson))}</textarea
+    >
+  </Card>
+{/if}
diff --git a/public/index.html b/public/index.html
index 6293fdd..5696fcf 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,7 +4,7 @@
 	<meta charset='utf-8'>
 	<meta name='viewport' content='width=device-width,initial-scale=1'>
 
-	<title>IoT Manager 4.1.5</title>
+	<title>IoT Manager 4.1.6</title>
 
 	<link rel='icon' type='image/png' href='/favicon.ico'>
 	<link rel='stylesheet' href='/build/bundle.css'>
diff --git a/src/App.svelte b/src/App.svelte
index f0abb42..e2c2c5b 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -575,6 +575,7 @@
   }
 
   function saveConfig() {
+    scenarioTxt = scenarioTxt;
     wsSendMsg(selectedWs, "/tuoyal|" + JSON.stringify(generateLayout()));
     wsSendMsg(selectedWs, "/gifnoc|" + JSON.stringify(configJson));
     wsSendMsg(selectedWs, "/oiranecs|" + scenarioTxt);
@@ -1128,7 +1129,7 @@
             {/if}
           </Route>
           <Route path="/config">
-            <ConfigPage show={configReady} configJson={configJson} widgetsJson={widgetsJson} itemsJson={itemsJson} bind:scenarioTxt saveConfig={() => saveConfig()} rebootEsp={() => rebootEsp()} />
+            <ConfigPage show={configReady} configJson={configJson} widgetsJson={widgetsJson} itemsJson={itemsJson} saveConfig={() => saveConfig()} rebootEsp={() => rebootEsp()} scenarioTxt={scenarioTxt} />
           </Route>
           <Route path="/connection">
             <ConnectionPage show={connectionReady} rebootEsp={() => rebootEsp()} ssidClick={() => ssidClick()} saveSett={() => saveSett()} saveMqtt={() => saveMqtt()} settingsJson={settingsJson} errorsJson={errorsJson} ssidJson={ssidJson} />
diff --git a/src/pages/Config.svelte b/src/pages/Config.svelte
index 972cbda..5ded7ac 100644
--- a/src/pages/Config.svelte
+++ b/src/pages/Config.svelte
@@ -125,7 +125,7 @@
     </Card>
 
     <Card title="Сценарии">
-      <textarea rows={height} cols="50" bind:value={scenarioTxt} class="px-2 bg-gray-50 border-2 border-gray-200 rounded text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-indigo-500 w-full" />
+      <textarea bind:value={scenarioTxt} rows={height} cols="50" class="px-2 bg-gray-50 border-2 border-gray-200 rounded text-gray-700 leading-tight focus:outline-none focus:bg-white focus:border-indigo-500 w-full" />
     </Card>
   </div>
   <div class="grd-1col1">