Fix merge conflicts

Fix merge conflicts

Author: Mcpoowl

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ChartJS",
-  "version": "3.1.4",
+  "version": "3.3.0",
   "description": "This widget is a wrapper for the ChartJS library and you can use it to visualize your aggregated data.",
   "license": "Apache License, Version 2",
   "author": "Mendix",

src/ChartJS/lib/charts.js

@@ -4685,10 +4685,6 @@
 				id: 'x-axis-0'
 			}],
 			yAxes: [{
-			        ticks:{
-			            callback:function(value){
-			            	return Number(value).toFixed(3);
-			            }},
 				type: "linear",
 				id: 'y-axis-0'
 			}],

src/ChartJS/widgets/LineChart/LineChart.xml

@@ -177,6 +177,11 @@
                 <attributeType name="Decimal"/>
             </attributeTypes>
         </property>
+        <property key="roundY" type="string" required="true" defaultValue="-1">
+            <caption>Round Y value</caption>
+            <category>Data Point</category>
+            <description>Number of decimals to round the value on the Y-axis. Disable it by setting it to '-1'</description>
+        </property>
         <!-- Behavior -->
         <property key="onclickmf" type="microflow" required="false">
             <caption>On Click Microflow</caption>

src/ChartJS/widgets/LineChart/widget/LineChart.js

@@ -132,18 +132,26 @@ define([
                                     labelString: (this.yLabel !== "") ? this.yLabel : "",
                                     fontFamily: this._font
                                 },
-                                ticks : { fontFamily: this._font }
+                                ticks : { fontFamily: this._font,
+                                callback: lang.hitch(this, function(value){
+                                        var round = parseInt(this.roundY);
+                                        if (!isNaN(round) && round >= 0) {
+                                            return Number(value).toFixed(round);
+                                        }
+                                        return value;
+                                    }) }
                             }],
                             xAxes: [{
                                 scaleLabel: {
                                     display: (this.xLabel !== "") ? true : false,
                                     labelString: (this.xLabel !== "") ? this.xLabel : "",
                                     fontFamily: this._font
                                 },
+                                type: "category",
+                                id: "x-axis-0", 
                                 ticks : { fontFamily: this._font, }
                             }]
                         },
-
                         responsive : this.responsive,
                         responsiveAnimationDuration : (this.responsiveAnimationDuration > 0 ? this.responsiveAnimationDuration : 0),
                         tooltips : {
@@ -211,7 +219,7 @@ define([
                         maintainAspectRatio : this.maintainAspectRatio,
 
                         // Custom tooltip?
-                        customTooltips : false //lang.hitch(this, this.customTooltip)
+                        customTooltips : false, //lang.hitch(this, this.customTooltip)
 
                     }
                 });

src/package.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="ChartJS" version="3.1.4" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="ChartJS" version="3.3.0" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="ChartJS/widgets/BarChart/BarChart.xml"/>
             <widgetFile path="ChartJS/widgets/LineChart/LineChart.xml"/>