Skip to content

Commit 5fac9d2

Browse files
author
Jelte Lagendijk
committed
Merge branch 'cdcharlebois-master'
2 parents 021f06e + 778347b commit 5fac9d2

File tree

17 files changed

+262
-144
lines changed

17 files changed

+262
-144
lines changed

src/ChartJS/widgets/BarChart/BarChart.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,14 @@
256256
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>
257257
<returnType type="Void"></returnType>
258258
</property>
259+
<property key="base64Attr" type="attribute" required="false">
260+
<caption>Base 64 Attribute</caption>
261+
<category>Behavior</category>
262+
<description>The attribute to store the base64 encoding of the chart when rendered.</description>
263+
<attributeTypes>
264+
<attributeType name="String"/>
265+
</attributeTypes>
266+
</property>
259267
<!-- Settings -->
260268
<property key="responsive" type="boolean" required="true" defaultValue="true">
261269
<caption>Responsive</caption>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,11 @@ define([
160160
scaleLineWidth : this.scaleLineWidth,
161161

162162
//The scale line color
163-
scaleLineColor : this.scaleLineColor
163+
scaleLineColor : this.scaleLineColor,
164+
165+
animation: {
166+
onComplete: lang.hitch(this, this._animationComplete)
167+
}
164168
})
165169
};
166170

0 commit comments

Comments
 (0)