From 92b89f48fb4c8b2cbdf19b2c63a5c31f8dbbbc8c Mon Sep 17 00:00:00 2001
From: javalikescript <javalikescript@free.fr>
Date: Sun, 15 Dec 2024 12:04:56 +0100
Subject: [PATCH] Fix textarea and cleanup

---
 extensions/web-base/addons.lua    |  8 ++---
 extensions/web-base/www/app.css   |  6 ++--
 extensions/web-notes/web-note.xml |  2 +-
 lha/Engine.lua                    | 51 +++++++++----------------------
 4 files changed, 24 insertions(+), 43 deletions(-)

diff --git a/extensions/web-base/addons.lua b/extensions/web-base/addons.lua
index 8ee2f58..1fe5de3 100644
--- a/extensions/web-base/addons.lua
+++ b/extensions/web-base/addons.lua
@@ -1,7 +1,7 @@
 
-local function onStartup(extension)
+local function onStartup(extension, script)
   extension:getEngine():onExtension('web-base', function(webBaseExtension)
-    webBaseExtension:registerAddonExtension(extension, true)
+    webBaseExtension:registerAddonExtension(extension, script or true)
   end)
 end
 
@@ -11,9 +11,9 @@ local function onShutdown(extension)
   end)
 end
 
-local function registerAddonExtension(extension)
+local function registerAddonExtension(extension, script)
   extension:subscribeEvent('startup', function()
-    onStartup(extension)
+    onStartup(extension, script)
   end)
   extension:subscribeEvent('shutdown', function()
     onShutdown(extension)
diff --git a/extensions/web-base/www/app.css b/extensions/web-base/www/app.css
index 00bc05d..38247f3 100644
--- a/extensions/web-base/www/app.css
+++ b/extensions/web-base/www/app.css
@@ -308,13 +308,15 @@ section > article > section > ul li textarea {
 }
 
 textarea.full {
-  height:  calc(100% - 1rem);
+  height:  calc(100% - 1.5rem);
   width:  calc(100% - 1rem);
   border: none;
   margin: 0px;
   padding: 0.5rem;
   resize: none;
-  font-size: 2rem;
+}
+textarea.full:focus {
+  outline: none;
 }
 
 .scrollable {
diff --git a/extensions/web-notes/web-note.xml b/extensions/web-notes/web-note.xml
index fcd69af..bc67a51 100644
--- a/extensions/web-notes/web-note.xml
+++ b/extensions/web-notes/web-note.xml
@@ -15,6 +15,6 @@
     <button v-on:click="app.back()" title="Close"><i class="fa fa-window-close"></i></button>
   </template>
   <article class="content">
-    <textarea v-model="text" v-on:keydown.ctrl.s.exact.prevent.stop="onSave()" spellcheck="false" wrap="off" class="full" placeholder="Enter your note here"></textarea>
+    <textarea v-model="text" v-on:keydown.ctrl.s.exact.prevent.stop="onSave()" spellcheck="false" wrap="off" class="full" style="font-size: 2rem" placeholder="Enter your note here"></textarea>
   </article>
 </app-page>
diff --git a/lha/Engine.lua b/lha/Engine.lua
index dae8f1b..0ba54ff 100644
--- a/lha/Engine.lua
+++ b/lha/Engine.lua
@@ -327,39 +327,15 @@ return class.create(function(engine)
     self:loadScriptExtensions()
   end
 
-  function engine:getScriptExtensions()
-    local scripts = {}
-    local others = {}
-    for _, extension in ipairs(self.extensions) do
-      if extension:getType() == 'script' then
-        table.insert(scripts, extension)
-      else
-        table.insert(others, extension)
-      end
-    end
-    return scripts, others
-  end
-
-  function engine:reloadExtensions(full, excludeScripts)
-    if excludeScripts then
-      local scripts, others = self:getScriptExtensions()
-      if full then
-        self.extensions = scripts
-        self:loadOtherExtensions()
-      else
-        for _, extension in ipairs(others) do
-          extension:restartExtension()
-        end
-      end
+  function engine:reloadExtensions(full)
+    if full then
+      self.extensions = List.filter(self.extensions, function(extension)
+        return extension:getType() == 'script'
+      end)
+      self:loadOtherExtensions()
     else
-      if full then
-        self:publishEvent('shutdown')
-        self:loadExtensions()
-        self:publishEvent('startup')
-        self:publishEvent('configuration')
-        self:publishEvent('things')
-      else
-        for _, extension in ipairs(self.extensions) do
+      for _, extension in ipairs(self.extensions) do
+        if extension:getType() ~= 'script' then
           extension:restartExtension()
         end
       end
@@ -367,13 +343,16 @@ return class.create(function(engine)
   end
 
   function engine:reloadScripts(full)
-    local scripts, others = self:getScriptExtensions()
     if full then
-      self.extensions = others
+      self.extensions = List.filter(self.extensions, function(extension)
+        return extension:getType() ~= 'script'
+      end)
       self:loadScriptExtensions()
     else
-      for _, extension in ipairs(scripts) do
-        extension:restartExtension()
+      for _, extension in ipairs(self.extensions) do
+        if extension:getType() == 'script' then
+          extension:restartExtension()
+        end
       end
     end
   end