Merge branch 'cdcharlebois-master'

mendixlabs · Dec 11, 2017 · 5fac9d2 · 5fac9d2
2 parents 021f06e + 778347b
commit 5fac9d2
Show file tree

Hide file tree

Showing 17 changed files with 262 additions and 144 deletions.
diff --git a/src/ChartJS/widgets/BarChart/BarChart.xml b/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>

diff --git a/src/ChartJS/widgets/BarChart/widget/BarChart.js b/src/ChartJS/widgets/BarChart/widget/BarChart.js
@@ -160,7 +160,11 @@ define([
                         scaleLineWidth : this.scaleLineWidth,
 
                         //The scale line color
-                        scaleLineColor : this.scaleLineColor
+                        scaleLineColor : this.scaleLineColor,
+
+                        animation: {
+                            onComplete: lang.hitch(this, this._animationComplete)
+                        }
                     })
                 };