Merge pull request #198 from Derek52/master

Fix issue that prevented callJSFunctions from running with no arguments.

src/main/kotlin/kweb/Kweb.kt

@@ -186,10 +186,9 @@ class Kweb private constructor(
             logger.debug("Temporarily storing message for ${server2ClientMessage.yourId} in threadlocal outboundMessageCatcher")
             val jsFunction = JsFunction(server2ClientMessage.jsId!!, server2ClientMessage.arguments!!)
             outboundMessageCatcher.add(jsFunction)
-            //If we have an outboundMessageCatcher, we do not want to execute the jsCode in this message.
-            //We still need to send the Server2ClientMessage, to cache the jsCode.
-            //So, we take the message, and set arguments to null, so the server knows not to run this code.
-            server2ClientMessage.arguments = null
+            //Setting `shouldExecute` to false tells the server not to add this jsFunction to the client's cache,
+            //but to not actually run the code. This is used to pre-cache functions on initial page render.
+            server2ClientMessage.shouldExecute = false
             wsClientData.send(server2ClientMessage)
         }
     }

src/main/kotlin/kweb/client/Server2ClientMessage.kt

@@ -27,5 +27,6 @@ data class Server2ClientMessage(
         val js: String? = null,
         val parameters: String? = null,
         val callbackId: Int? = null,
-        var arguments: List<JsonElement>? = emptyList()
+        val arguments: List<JsonElement> = emptyList(),
+        var shouldExecute: Boolean = true
 )

src/main/kotlin/kweb/html/events/OnImmediateReceiver.kt

@@ -1,6 +1,7 @@
 package kweb.html.events
 
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.decodeFromJsonElement
 import kweb.*
 import kweb.plugins.fomanticUI.fomantic
@@ -139,11 +140,6 @@ fun main() {
                 label.onImmediate.click {
                     label.text("Clicked!")
                 }
-                val clickButton = button(fomantic.ui.button).text("Click").apply {
-                    on.click {
-                        label.text("Button was clicked")
-                    }
-                }
             }
         }
     }

src/main/resources/kweb/kweb_bootstrap.js

@@ -54,8 +54,7 @@ function handleInboundMessage(msg) {
         }
     }
 
-    //if arguments is null, do not execute the function in this inbound message
-    if (args == null) return
+    if (msg["shouldExecute"] === false) return
 
     if (callbackId !== undefined) {
         try {