From 736b80835f67c9c34657074ebcfbe0752bef1c18 Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Thu, 17 Oct 2019 21:58:34 +0200
Subject: Move DSL builder functions out of the companion objects (#93)

---
 .../main/kotlin/pl/treksoft/kvision/chart/Chart.kt | 33 +++++++++++-----------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'kvision-modules/kvision-chart/src/main/kotlin/pl')

diff --git a/kvision-modules/kvision-chart/src/main/kotlin/pl/treksoft/kvision/chart/Chart.kt b/kvision-modules/kvision-chart/src/main/kotlin/pl/treksoft/kvision/chart/Chart.kt
index 91658476..29cc80c2 100644
--- a/kvision-modules/kvision-chart/src/main/kotlin/pl/treksoft/kvision/chart/Chart.kt
+++ b/kvision-modules/kvision-chart/src/main/kotlin/pl/treksoft/kvision/chart/Chart.kt
@@ -110,22 +110,6 @@ open class Chart(
     }
 
     companion object {
-        /**
-         * DSL builder extension function.
-         *
-         * It takes the same parameters as the constructor of the built component.
-         */
-        fun Container.chart(
-            configuration: Configuration,
-            chartWidth: Int? = null,
-            chartHeight: Int? = null,
-            classes: Set<String> = setOf(),
-            init: (Chart.() -> Unit)? = null
-        ): Chart {
-            val chart = Chart(configuration, chartWidth, chartHeight, classes).apply { init?.invoke(this) }
-            this.add(chart)
-            return chart
-        }
 
         fun registerPlugin(plugin: dynamic) {
             JsChart.plugins.register(plugin)
@@ -136,3 +120,20 @@ open class Chart(
         }
     }
 }
+
+/**
+ * DSL builder extension function.
+ *
+ * It takes the same parameters as the constructor of the built component.
+ */
+fun Container.chart(
+    configuration: Configuration,
+    chartWidth: Int? = null,
+    chartHeight: Int? = null,
+    classes: Set<String> = setOf(),
+    init: (Chart.() -> Unit)? = null
+): Chart {
+    val chart = Chart(configuration, chartWidth, chartHeight, classes).apply { init?.invoke(this) }
+    this.add(chart)
+    return chart
+}
-- 
cgit