From 40fef38017ab92757a99e780d0055bf9c71edc46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20Ku=C4=87mierz?= <gkucmierz@gmail.com>
Date: Thu, 17 Nov 2022 23:01:31 +0100
Subject: [PATCH] apply added settings in app

---
 src/components/Result.vue        | 10 +++++++++-
 src/file.worker.js               |  6 ++++--
 src/services/settingsService.mjs |  2 +-
 src/views/HomeView.vue           |  8 ++++++--
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/components/Result.vue b/src/components/Result.vue
index 04638de..d981895 100644
--- a/src/components/Result.vue
+++ b/src/components/Result.vue
@@ -1,11 +1,19 @@
 <script>
 import { defineComponent } from 'vue';
+import settingsService from '../services/settingsService';
 
 export default defineComponent({
   name: 'Result',
   props: [
     'data'
   ],
+  watch: {
+    data(val) {
+      if (!settingsService.getItem('autoScroll')) return;
+      const pre = this.$refs.pre;
+      setTimeout(() => pre.scrollTo(0, pre.scrollHeight), 1);
+    },
+  }
 });
 </script>
 
@@ -24,7 +32,7 @@ export default defineComponent({
 </style>
 
 <template>
-  <div class="result">
+  <div class="result" ref="pre">
     <pre class="selectable">{{ data }}</pre>
   </div>
 </template>
diff --git a/src/file.worker.js b/src/file.worker.js
index 7ae9782..a2ced31 100644
--- a/src/file.worker.js
+++ b/src/file.worker.js
@@ -63,10 +63,12 @@ const e = err => {
 };
 
 addEventListener('message', ({ data }) => {
+  const { code, settings } = data;
   try {
-    const code = new Function(addDefaultLog(data));
-    code();
+    const runner = new Function(settings.autoPrint ? addDefaultLog(code) : code);
+    runner();
   } catch (e) {
     console.error(e);
+    log(e);
   }
 });
diff --git a/src/services/settingsService.mjs b/src/services/settingsService.mjs
index fd58023..2f4cc83 100644
--- a/src/services/settingsService.mjs
+++ b/src/services/settingsService.mjs
@@ -30,7 +30,7 @@ const settingsService = {
     return data;
   },
   set(value) {
-    data = value;
+    data = { ...data, ...value };
     save();
   },
   // ee,
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 6c7fa05..cd0e34a 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,8 +1,9 @@
 <script>
 
+import { WELCOME_CODE, STORAGE_KEY_CODE } from '../app.config';
 import Result from '../components/Result.vue';
 import Code from '../components/Code.vue';
-import { WELCOME_CODE, STORAGE_KEY_CODE } from '../app.config';
+import settingsService from '../services/settingsService';
 
 import Worker from '../file.worker.js?worker';
 
@@ -54,7 +55,10 @@ export default defineComponent({
         this.result += error.message;
       };
 
-      this.worker.postMessage(code);
+      this.worker.postMessage({
+        code,
+        settings: settingsService.get(),
+      });
     },
     terminate() {
       if (this.worker) {