Merge branch 'master' into bugfix_x_labels

README.md

@@ -1,4 +1,4 @@
-# Mendix ChartJS widget
+# Mendix ChartJS widget [![Support](https://img.shields.io/badge/Mendix%20Support%3A-Platform-green.svg)](https://docs.mendix.com/community/app-store/app-store-content-support)
 
 This [widget](https://appstore.home.mendix.com/link/app/1712/Mendix/ChartJS-Widget) is a wrapper for the [ChartJS library](http://www.chartjs.org/) and you can use it to visualize your aggregated data.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ChartJS",
-  "version": "3.6.1",
+  "version": "3.7.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/widgets/BarChart/BarChart.xml

@@ -256,6 +256,14 @@
 Note: This is experimental. In case of non-persistent objects this should not be necessary, and in MX 7 this is useless. Only use this if you experience memory leaks in Mendix 5</description>
             <returnType type="Void"></returnType>
         </property>
+        <property key="base64Attr" type="attribute" required="false">
+            <caption>Base 64 Attribute</caption>
+            <category>Behavior</category>
+            <description>The attribute to store the base64 encoding of the chart when rendered.</description>
+            <attributeTypes>
+                <attributeType name="String"/>
+            </attributeTypes>
+        </property>
         <!-- Settings -->
         <property key="responsive" type="boolean" required="true" defaultValue="true">
             <caption>Responsive</caption>

src/ChartJS/widgets/BarChart/widget/BarChart.js

@@ -165,7 +165,11 @@ define([
                         scaleLineWidth : this.scaleLineWidth,
 
                         //The scale line color
-                        scaleLineColor : this.scaleLineColor
+                        scaleLineColor : this.scaleLineColor,
+
+                        animation: {
+                            onComplete: lang.hitch(this, this._animationComplete)
+                        }
                     })
                 };