Skip to content

Commit

Permalink
Cleanup whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
Jelte Lagendijk committed May 10, 2017
1 parent 7e35095 commit a737622
Show file tree
Hide file tree
Showing 9 changed files with 186 additions and 186 deletions.
34 changes: 17 additions & 17 deletions src/ChartJS/widgets/BarChart/BarChart.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
<property key="height" type="integer" required="true" defaultValue="250">
<caption>Height</caption>
<category>Appearance</category>
<description>Initial height of the chart canvas, will be ignored when responsive property is set to 'Yes'</description>
<description>Initial height of the chart canvas, will be ignored when responsive property is set to 'Yes'</description>
</property>
<property key="responsiveRatio" type="integer" required="true" defaultValue="0">
<caption>Responsive w/h ratio (%)</caption>
<category>Appearance</category>
<description>Responsive is set to 'true': Responsive width height ratio default value is 0, which means it will set the height of the chart the same height as the container. If you set this value to a certain number, it will create a chart where the height is a percentage of the width. So 100 means the height will be 100% of the width (a square)</description>
<description>Responsive is set to 'true': Responsive width height ratio default value is 0, which means it will set the height of the chart the same height as the container. If you set this value to a certain number, it will create a chart where the height is a percentage of the width. So 100 means the height will be 100% of the width (a square)</description>
</property>
<property key="labelFont" type="string" required="true" defaultValue="Helvetica Neue">
<caption>Font</caption>
Expand Down Expand Up @@ -113,8 +113,8 @@
<description>Microflow returning a 'Chart Entity' object.</description>
<returnType type="Object" entityProperty="sourceentity"></returnType>
</property>
<!--Placeholder-->
<!--<property key="sourceTrigger" type="attribute" entityProperty="sourceentity" allowNonPersistableEntities="true" required="false">
<!--Placeholder-->
<!--<property key="sourceTrigger" type="attribute" entityProperty="sourceentity" allowNonPersistableEntities="true" required="false">
<caption>Attribute to trigger</caption>
<category>Data Set</category>
<description>Attribute to trigger the microflow.</description>
Expand Down Expand Up @@ -157,23 +157,23 @@
<category>Data Set</category>
<description>Initial bar color</description>
<attributeTypes>
<attributeType name="Enum"/>
<attributeType name="String"/>
<attributeType name="Enum"/>
<attributeType name="String"/>
</attributeTypes>
</property>
<property key="serieshighlightcolor" type="attribute" entityProperty="datasetentity" allowNonPersistableEntities="true" required="false">
<caption>Highlight Color (in Hex)</caption>
<category>Data Set</category>
<description>Color while hovering over bar.</description>
<attributeTypes>
<attributeType name="Enum"/>
<attributeType name="String"/>
<attributeType name="Enum"/>
<attributeType name="String"/>
</attributeTypes>
</property>
<property key="seriesColorReduceOpacity" type="boolean" required="true" defaultValue="true">
<caption>Reduce opacity</caption>
<category>Data Set</category>
<description>Adds transparency to the fill color(opacity:0.5) and highlight color(opacity:0.75)</description>
<description>Adds transparency to the fill color(opacity:0.5) and highlight color(opacity:0.75)</description>
</property>
<!-- Data Point -->
<property key="datapointentity" type="entity" required="true" allowNonPersistableEntities="true" entityProperty="datasetentity" isPath="yes" pathType="referenceSet">
Expand Down Expand Up @@ -257,7 +257,7 @@
<property key="scaleBeginAtZero" type="boolean" required="true" defaultValue="true">
<caption>Begin at zero</caption>
<category>Settings</category>
<description>Whether the scale should start at zero, or an order of magnitude down from the lowest value</description>
<description>Whether the scale should start at zero, or an order of magnitude down from the lowest value</description>
</property>
<property key="scaleShow" type="boolean" required="true" defaultValue="true">
<caption>Show scales</caption>
Expand Down Expand Up @@ -314,15 +314,15 @@
<category>Settings</category>
<description>Whether to show the labels on the X-axis scale.</description>
</property>
<property key="scaleShowLabels" type="boolean" required="true" defaultValue="true">
<caption>Show labels Y-axis</caption>
<category>Settings</category>
<description>Whether to show labels on the y-axis scale.</description>
</property>
<property key="scaleShowLabels" type="boolean" required="true" defaultValue="true">
<caption>Show labels Y-axis</caption>
<category>Settings</category>
<description>Whether to show labels on the y-axis scale.</description>
</property>
<property key="showTooltips" type="boolean" required="true" defaultValue="true">
<caption>Show tooltip</caption>
<category>Settings</category>
<description>Determines whether to draw tooltips on the canvas or not.</description>
<description>Determines whether to draw tooltips on the canvas or not.</description>
</property>
<!--<property key="tooltipForm" type="form" required="false">
<caption>Tooltip form</caption>
Expand All @@ -332,7 +332,7 @@
<property key="maintainAspectRatio" type="boolean" required="true" defaultValue="true">
<caption>Maintain aspect ratio</caption>
<category>Settings</category>
<description>Whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container</description>
<description>Whether to maintain the starting aspect ratio or not when responsive, if set to false, will take up entire container</description>
</property>
<!-- Bar chart settings -->
<property key="barShowStroke" type="boolean" required="true" defaultValue="true">
Expand Down
6 changes: 3 additions & 3 deletions src/ChartJS/widgets/Core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -614,9 +614,9 @@ define([
maintainAspectRatio : this.maintainAspectRatio,
showTooltips : this.showTooltips,
animation: this.chartAnimation ? ({
duration: this.chartAnimation ? this.animationDuration : 0,
easing: this.animationEasing
}) : false
duration: this.chartAnimation ? this.animationDuration : 0,
easing: this.animationEasing
}) : false
};

return lang.mixin(lang.clone(defaultOptions), options);
Expand Down
60 changes: 30 additions & 30 deletions src/ChartJS/widgets/DoughnutChart/DoughnutChart.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
<property key="width" type="integer" required="true" defaultValue="500">
<caption>Width</caption>
<category>Appearance</category>
<description>Initial width of the chart canvas, will be ignored when responsive property is set to 'Yes'</description>
<description>Initial width of the chart canvas, will be ignored when responsive property is set to 'Yes'</description>
</property>
<property key="height" type="integer" required="true" defaultValue="250">
<caption>Height</caption>
<category>Appearance</category>
<description>Initial height of the chart canvas, will be ignored when responsive property is set to 'Yes'</description>
<description>Initial height of the chart canvas, will be ignored when responsive property is set to 'Yes'</description>
</property>
<property key="responsiveRatio" type="integer" required="true" defaultValue="0">
<caption>Responsive w/h ratio (%)</caption>
Expand Down Expand Up @@ -100,25 +100,25 @@
<property key="sourceentity" type="entity" required="true" allowNonPersistableEntities="true">
<caption>Chart Entity</caption>
<category>Data Source</category>
<description>Container entity, referencing DataSet entity objects.</description>
<description>Container entity, referencing DataSet entity objects.</description>
</property>
<property key="datasourcemf" type="microflow" required="false">
<caption>Microflow</caption>
<category>Data Source</category>
<description>Microflow returning a 'Chart Entity' object.</description>
<description>Microflow returning a 'Chart Entity' object.</description>
<returnType type="Object" entityProperty="sourceentity"></returnType>
</property>
<property key="numberInside" type="attribute" entityProperty="sourceentity" required="false">
<caption>Total value</caption>
<category>Data Source</category>
<description>Optional: attribute containing a total value </description>
<attributeTypes>
<attributeType name="String"/>
<attributeType name="Integer"/>
<attributeType name="Float"/>
<property key="numberInside" type="attribute" entityProperty="sourceentity" required="false">
<caption>Total value</caption>
<category>Data Source</category>
<description>Optional: attribute containing a total value </description>
<attributeTypes>
<attributeType name="String"/>
<attributeType name="Integer"/>
<attributeType name="Float"/>
<attributeType name="Decimal"/>
</attributeTypes>
</property>
</attributeTypes>
</property>
<!--<property key="sourceTrigger" type="attribute" entityProperty="sourceentity" allowNonPersistableEntities="true" required="false">
<caption>Attribute to trigger</caption>
<category>Data Set</category>
Expand All @@ -132,13 +132,13 @@
<property key="datasetentity" type="entity" required="true" allowNonPersistableEntities="true" entityProperty="sourceentity" isPath="yes" pathType="referenceSet">
<caption>Data Set Entity</caption>
<category>Data Set</category>
<description>Entity, containing value representing a doughnut part</description>
<description>Entity, containing value representing a doughnut part</description>
</property>

<property key="datasetlabel" type="attribute" entityProperty="datasetentity" allowNonPersistableEntities="true" required="true">
<caption>Data Set label</caption>
<category>Data Set</category>
<description>Label, displayed in legend</description>
<description>Label, displayed in legend</description>
<attributeTypes>
<attributeType name="Enum"/>
<attributeType name="String"/>
Expand All @@ -147,7 +147,7 @@
<property key="datasetsorting" type="attribute" entityProperty="datasetentity" allowNonPersistableEntities="true" required="true">
<caption>Sorting</caption>
<category>Data Set</category>
<description>Attribute used for sorting dataset objects</description>
<description>Attribute used for sorting dataset objects</description>
<attributeTypes>
<attributeType name="AutoNumber"/>
<attributeType name="Currency"/>
Expand All @@ -172,16 +172,16 @@
<category>Data Set</category>
<description>Set the highlight color of the doughnut part.</description>
<attributeTypes>
<attributeType name="Enum"/>
<attributeType name="String"/>
</attributeTypes>
</property>
<property key="seriesColorReduceOpacity" type="boolean" required="true" defaultValue="true">
<caption>Reduce opacity</caption>
<category>Data Set</category>
<description>Adds transparency to the fill color(opacity:0.5) and highlight color(opacity:0.75)</description>
</property>
<property key="seriesylabel" type="attribute" entityProperty="datasetentity" allowNonPersistableEntities="true" required="true">
<attributeType name="Enum"/>
<attributeType name="String"/>
</attributeTypes>
</property>
<property key="seriesColorReduceOpacity" type="boolean" required="true" defaultValue="true">
<caption>Reduce opacity</caption>
<category>Data Set</category>
<description>Adds transparency to the fill color(opacity:0.5) and highlight color(opacity:0.75)</description>
</property>
<property key="seriesylabel" type="attribute" entityProperty="datasetentity" allowNonPersistableEntities="true" required="true">
<caption>Value</caption>
<category>Data Set</category>
<description>Doughnut part value</description>
Expand All @@ -202,7 +202,7 @@
<property key="onclickmf" type="microflow" required="false">
<caption>On Click Microflow</caption>
<category>Behavior</category>
<description>Microflow to invoke when chart canvas is clicked</description>
<description>Microflow to invoke when chart canvas is clicked</description>
<returnType type="Void"></returnType>
</property>
<property key="onclickDataSetMf" type="microflow" required="false" entityProperty="datasetentity">
Expand All @@ -215,7 +215,7 @@
<property key="responsive" type="boolean" required="true" defaultValue="true">
<caption>Responsive</caption>
<category>Appearance</category>
<description>Chart canvas dimensions respond to changes in layout</description>
<description>Chart canvas dimensions respond to changes in layout</description>
</property>
<property key="segmentShowStroke" type="boolean" required="true" defaultValue="true">
<caption>Segment Show Stroke</caption>
Expand Down Expand Up @@ -245,7 +245,7 @@
<property key="showTooltips" type="boolean" required="true" defaultValue="false">
<caption>Show tooltip</caption>
<category>Settings</category>
<description>Determines whether to draw tooltips on the canvas or not.</description>
<description>Determines whether to draw tooltips on the canvas or not.</description>
</property>
<!--<property key="tooltipForm" type="form" required="false">
<caption>Tooltip form</caption>
Expand Down
Loading

0 comments on commit a737622

Please sign in to comment.