From 99dcb8e434d7e0ccf5dada379c1b03e894e6aa82 Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Wed, 26 Feb 2020 13:30:23 +0100
Subject: Major changes in the event handling architecture. Support for
 multiple event handlers.

---
 .../main/kotlin/pl/treksoft/kvision/form/select/Select.kt   | 13 ++++++++-----
 .../kotlin/pl/treksoft/kvision/form/select/SelectInput.kt   |  3 ++-
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'kvision-modules/kvision-bootstrap-select/src/main/kotlin/pl/treksoft')

diff --git a/kvision-modules/kvision-bootstrap-select/src/main/kotlin/pl/treksoft/kvision/form/select/Select.kt b/kvision-modules/kvision-bootstrap-select/src/main/kotlin/pl/treksoft/kvision/form/select/Select.kt
index cd8b5817..9f66afd8 100644
--- a/kvision-modules/kvision-bootstrap-select/src/main/kotlin/pl/treksoft/kvision/form/select/Select.kt
+++ b/kvision-modules/kvision-bootstrap-select/src/main/kotlin/pl/treksoft/kvision/form/select/Select.kt
@@ -205,15 +205,18 @@ open class Select(
     }
 
     @Suppress("UNCHECKED_CAST")
-    override fun <T : Widget> setEventListener(block: SnOn<T>.() -> Unit): Widget {
-        input.setEventListener(block)
-        return this
+    override fun <T : Widget> setEventListener(block: SnOn<T>.() -> Unit): Int {
+        return input.setEventListener(block)
     }
 
     @Deprecated("Use onEvent extension function instead.", ReplaceWith("onEvent(block)", "pl.treksoft.kvision.core.onEvent"))
-    override fun setEventListener(block: SnOn<Widget>.() -> Unit): Widget {
+    override fun setEventListener(block: SnOn<Widget>.() -> Unit): Int {
         @Suppress("DEPRECATION")
-        input.setEventListener(block)
+        return input.setEventListener(block)
+    }
+
+    override fun removeEventListener(id: Int): Widget {
+        input.removeEventListener(id)
         return this
     }
 
diff --git a/kvision-modules/kvision-bootstrap-select/src/main/kotlin/pl/treksoft/kvision/form/select/SelectInput.kt b/kvision-modules/kvision-bootstrap-select/src/main/kotlin/pl/treksoft/kvision/form/select/SelectInput.kt
index fe574fa7..a96e614e 100644
--- a/kvision-modules/kvision-bootstrap-select/src/main/kotlin/pl/treksoft/kvision/form/select/SelectInput.kt
+++ b/kvision-modules/kvision-bootstrap-select/src/main/kotlin/pl/treksoft/kvision/form/select/SelectInput.kt
@@ -28,6 +28,7 @@ import pl.treksoft.kvision.core.Container
 import pl.treksoft.kvision.core.CssSize
 import pl.treksoft.kvision.core.StringBoolPair
 import pl.treksoft.kvision.core.StringPair
+import pl.treksoft.kvision.core.onEvent
 import pl.treksoft.kvision.form.FormInput
 import pl.treksoft.kvision.form.InputSize
 import pl.treksoft.kvision.form.ValidationStatus
@@ -149,7 +150,7 @@ open class SelectInput(
 
     init {
         setChildrenFromOptions()
-        this.setInternalEventListener<SelectInput> {
+        this.onEvent {
             change = {
                 val v = getElementJQuery()?.`val`()
                 self.value = v?.let {
-- 
cgit