Merge pull request #38 from robert-cronin/master

Fix namespace issue

3 files changed, 7 insertions, 7 deletions

diff --git a/kvision-modules/kvision-chart/src/main/kotlin/pl/treksoft/kvision/chart/Configuration.kt b/kvision-modules/kvision-chart/src/main/kotlin/pl/treksoft/kvision/chart/Configuration.kt
index 0925a0c8..df3b7973 100644
--- a/kvision-modules/kvision-chart/src/main/kotlin/pl/treksoft/kvision/chart/Configuration.kt
+++ b/kvision-modules/kvision-chart/src/main/kotlin/pl/treksoft/kvision/chart/Configuration.kt
@@ -728,7 +728,7 @@ fun ChartScales.toJs(i18nTranslator: (String) -> (String)): dynamic {
 /**
  * Chart options.
  */
-data class Options(
+data class ChartOptions(
     val responsive: Boolean = true,
     val responsiveAnimationDuration: Int = 0,
     val aspectRatio: Int = 2,
@@ -758,7 +758,7 @@ data class Options(
  * An extension function to convert configuration class to JS object.
  */
 @Suppress("ComplexMethod")
-fun Options.toJs(i18nTranslator: (String) -> (String)): dynamic {
+fun ChartOptions.toJs(i18nTranslator: (String) -> (String)): dynamic {
     return obj {
         this.responsive = responsive
         this.responsiveAnimationDuration = responsiveAnimationDuration
@@ -889,7 +889,7 @@ data class Configuration(
     val type: ChartType,
     val dataSets: List<DataSets>,
     val labels: List<String>? = null,
-    val options: Options? = null
+    val options: ChartOptions? = null
 )
 
 /**
diff --git a/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/chart/ChartCanvasSpec.kt b/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/chart/ChartCanvasSpec.kt
index 9ea2ee6e..6fae54ad 100644
--- a/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/chart/ChartCanvasSpec.kt
+++ b/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/chart/ChartCanvasSpec.kt
@@ -25,7 +25,7 @@ import pl.treksoft.kvision.chart.ChartCanvas
 import pl.treksoft.kvision.chart.ChartType
 import pl.treksoft.kvision.chart.Configuration
 import pl.treksoft.kvision.chart.DataSets
-import pl.treksoft.kvision.chart.Options
+import pl.treksoft.kvision.chart.ChartOptions
 import pl.treksoft.kvision.panel.Root
 import test.pl.treksoft.kvision.DomSpec
 import kotlin.browser.document
@@ -62,7 +62,7 @@ class ChartCanvasSpec : DomSpec {
                 configuration = Configuration(
                     ChartType.SCATTER,
                     listOf(DataSets(label = "Chart", data = listOf(0, 1))),
-                    options = Options(responsive = false)
+                    options = ChartOptions(responsive = false)
                 )
             )
             root.add(chart)
diff --git a/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/chart/ChartSpec.kt b/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/chart/ChartSpec.kt
index 2e508107..7974ea78 100644
--- a/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/chart/ChartSpec.kt
+++ b/kvision-modules/kvision-chart/src/test/kotlin/test/pl/treksoft/kvision/chart/ChartSpec.kt
@@ -25,7 +25,7 @@ import pl.treksoft.kvision.chart.Chart
 import pl.treksoft.kvision.chart.ChartType
 import pl.treksoft.kvision.chart.Configuration
 import pl.treksoft.kvision.chart.DataSets
-import pl.treksoft.kvision.chart.Options
+import pl.treksoft.kvision.chart.ChartOptions
 import pl.treksoft.kvision.panel.Root
 import pl.treksoft.kvision.utils.px
 import test.pl.treksoft.kvision.DomSpec
@@ -65,7 +65,7 @@ class ChartSpec : DomSpec {
                 Configuration(
                     ChartType.SCATTER,
                     listOf(DataSets(label = "Chart", data = listOf(0, 1))),
-                    options = Options(responsive = false)
+                    options = ChartOptions(responsive = false)
                 ), 300, 600
             )
             root.add(chart)