From 0c6da96f0ce5ddbbfa58d9efed96ac62f2a22221 Mon Sep 17 00:00:00 2001
From: Robbie Cronin <robert.cronin@uqconnect.edu.au>
Date: Wed, 1 May 2019 09:13:53 +0800
Subject: Fix namespace issue

Rename 2 conflicting Options variables in Charts and Tabulator packages to ChartOptions and TabulatorOptions respectively
---
 .../src/main/kotlin/pl/treksoft/kvision/chart/Configuration.kt          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

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..a598bc5d 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,
-- 
cgit 


From 37e980522d2512b25e0bfa074fce42732d5c0596 Mon Sep 17 00:00:00 2001
From: Robbie Cronin <robert.cronin@uqconnect.edu.au>
Date: Wed, 1 May 2019 14:13:09 +0800
Subject: Update missed namespace changes

Change Options to ChartOptions to match new variable name
---
 .../src/main/kotlin/pl/treksoft/kvision/chart/Configuration.kt        | 4 ++--
 1 file changed, 2 insertions(+), 2 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/Configuration.kt b/kvision-modules/kvision-chart/src/main/kotlin/pl/treksoft/kvision/chart/Configuration.kt
index a598bc5d..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
@@ -758,7 +758,7 @@ data class ChartOptions(
  * 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
 )
 
 /**
-- 
cgit