Move DSL builder functions out of the companion objects (#93)

1 files changed, 18 insertions, 21 deletions

diff --git a/kvision-modules/kvision-tabulator-remote/src/main/kotlin/pl/treksoft/kvision/tabulator/TabulatorRemote.kt b/kvision-modules/kvision-tabulator-remote/src/main/kotlin/pl/treksoft/kvision/tabulator/TabulatorRemote.kt
index 4478b942..d37f3ea9 100644
--- a/kvision-modules/kvision-tabulator-remote/src/main/kotlin/pl/treksoft/kvision/tabulator/TabulatorRemote.kt
+++ b/kvision-modules/kvision-tabulator-remote/src/main/kotlin/pl/treksoft/kvision/tabulator/TabulatorRemote.kt
@@ -89,26 +89,23 @@ open class TabulatorRemote<T : Any, E : Any>(
             }
         }
     }
+}
 
-    companion object {
-        /**
-         * DSL builder extension function.
-         *
-         * It takes the same parameters as the constructor of the built component.
-         */
-        fun <T : Any, E : Any> Container.tabulatorRemote(
-            serviceManager: KVServiceManager<E>,
-            function: E.(Int?, Int?, List<RemoteFilter>?, List<RemoteSorter>?) -> RemoteData<T>,
-            options: TabulatorOptions<T> = TabulatorOptions(),
-            types: Set<TableType> = setOf(),
-            classes: Set<String> = setOf(),
-            init: (TabulatorRemote<T, E>.() -> Unit)? = null
-        ): TabulatorRemote<T, E> {
-            val tabulatorRemote = TabulatorRemote(serviceManager, function, options, types, classes)
-            init?.invoke(tabulatorRemote)
-            this.add(tabulatorRemote)
-            return tabulatorRemote
-        }
-    }
-
+/**
+ * DSL builder extension function.
+ *
+ * It takes the same parameters as the constructor of the built component.
+ */
+fun <T : Any, E : Any> Container.tabulatorRemote(
+    serviceManager: KVServiceManager<E>,
+    function: E.(Int?, Int?, List<RemoteFilter>?, List<RemoteSorter>?) -> RemoteData<T>,
+    options: TabulatorOptions<T> = TabulatorOptions(),
+    types: Set<TableType> = setOf(),
+    classes: Set<String> = setOf(),
+    init: (TabulatorRemote<T, E>.() -> Unit)? = null
+): TabulatorRemote<T, E> {
+    val tabulatorRemote = TabulatorRemote(serviceManager, function, options, types, classes)
+    init?.invoke(tabulatorRemote)
+    this.add(tabulatorRemote)
+    return tabulatorRemote
 }