aboutsummaryrefslogtreecommitdiff
path: root/kvision-modules/kvision-chart/src/main
diff options
context:
space:
mode:
authorRobert Jaros <rjaros@users.noreply.github.com>2019-05-07 13:18:42 +0200
committerGitHub <noreply@github.com>2019-05-07 13:18:42 +0200
commit3b898f573950c09bc20ef26c8109157295f4e6ec (patch)
tree100087c8db8e89f4b5de2bbdb976fc576ae5c98b /kvision-modules/kvision-chart/src/main
parent736b9e0ab17a2ce655f534659a84a18a37daa87a (diff)
parent63767fec9660bdcbfd041ec28fb76ba95b322f2a (diff)
downloadkvision-3b898f573950c09bc20ef26c8109157295f4e6ec.tar.gz
kvision-3b898f573950c09bc20ef26c8109157295f4e6ec.tar.bz2
kvision-3b898f573950c09bc20ef26c8109157295f4e6ec.zip
Merge pull request #38 from robert-cronin/master
Fix namespace issue
Diffstat (limited to 'kvision-modules/kvision-chart/src/main')
-rw-r--r--kvision-modules/kvision-chart/src/main/kotlin/pl/treksoft/kvision/chart/Configuration.kt6
1 files changed, 3 insertions, 3 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
)
/**