revert TodoApp change while debugging what went wrong

kwebio · Jun 14, 2021 · f4059ab · f4059ab
1 parent 726b136
commit f4059ab
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 31 deletions.
diff --git a/src/main/kotlin/kweb/demos/todo/TodoApp.kt b/src/main/kotlin/kweb/demos/todo/TodoApp.kt
@@ -1,9 +1,7 @@
 package kweb.demos.todo
-
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.future.await
 import kotlinx.coroutines.launch
-import kotlinx.serialization.json.jsonPrimitive
 import kweb.*
 import kweb.plugins.fomanticUI.fomantic
 import kweb.plugins.fomanticUI.fomanticUIPlugin
@@ -143,25 +141,26 @@ class TodoApp {
         }
         div(fomantic.ui.action.input) {
             val input = input(type = InputType.text, placeholder = "Add Item")
-            // Note that an event can optionally evaluate a javascript expression and retrieve the
-            // result, which is supplied to the event handler in event.retrieved.
-            input.on(retrieveJs = input.valueJsExpression).keypress { event ->
-                if (event.code == "Enter") {
-                    handleAddItem(input, list, event.retrieved.jsonPrimitive.content)
+            input.on.keypress { ke ->
+                if (ke.code == "Enter") {
+                    handleAddItem(input, list)
                 }
             }
             button(fomantic.ui.button).text("Add").apply {
-                on(retrieveJs = input.valueJsExpression).click { event ->
-                    handleAddItem(input, list, event.retrieved.jsonPrimitive.content)
+                on.click {
+                    handleAddItem(input, list)
                 }
             }
         }
     }
 
-    private fun handleAddItem(input: InputElement, list: KVar<ToDoState.List>, newItemText: String) {
-        input.setValue("")
-        val newItem = ToDoState.Item(generateNewUid(), System.currentTimeMillis(), list.value.uid, newItemText)
-        state.items[newItem.uid] = newItem
+    private fun handleAddItem(input: InputElement, list: KVar<ToDoState.List>) {
+        GlobalScope.launch {
+            val newItemText = input.getValue()
+            input.setValue("")
+            val newItem = ToDoState.Item(generateNewUid(), System.currentTimeMillis(), list.value.uid, newItemText)
+            state.items[newItem.uid] = newItem
+        }
     }
 
     private fun ElementCreator<DivElement>.renderRemoveButton(item: KVar<ToDoState.Item>) {

diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
@@ -1,19 +1,19 @@
-<configuration>
-
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>
-                %d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n
-            </Pattern>
-        </layout>
-    </appender>
-
-    <logger name="kweb" level="debug">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
-
-    <root level="warn">
-        <appender-ref ref="CONSOLE"/>
-    </root>
-
+<configuration debug="true">
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>
+                %d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n
+            </Pattern>
+        </layout>
+    </appender>
+
+    <logger name="kweb" level="debug">
+        <appender-ref ref="CONSOLE"/>
+    </logger>
+
+    <root level="warn">
+        <appender-ref ref="CONSOLE"/>
+    </root>
+
 </configuration>