Fix issues with Begin at zero, fix #72 and partial #67

Author: Jelte Lagendijk

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

@@ -130,7 +130,10 @@ define([
                                     labelString: (this.yLabel !== "") ? this.yLabel : "",
                                     fontFamily: this._font
                                 },
-                                ticks : { fontFamily: this._font, }
+                                ticks : {
+                                    fontFamily: this._font,
+                                    beginAtZero: this.scaleBeginAtZero
+                                }
                             }],
 
                         },
@@ -148,9 +151,6 @@ define([
                         //Boolean - Whether to show labels on the scale
                         scaleShowLabels : this.scaleShowLabels,
 
-                        //Boolean - Whether the scale should start at zero, or an order of magnitude down from the lowest value
-                        scaleBeginAtZero : this.scaleBeginAtZero,
-
                         //Boolean - Whether grid lines are shown across the chart
                         scaleShowGridLines : this.scaleShowGridLines,
 

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

@@ -141,14 +141,17 @@ define([
                                     labelString: (this.yLabel !== "") ? this.yLabel : "",
                                     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;
-                                    }) }
+                                ticks : {
+                                    fontFamily: this._font,
+                                    beginAtZero: this.scaleBeginAtZero,
+                                    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: {

src/ChartJS/widgets/PolarChart/widget/PolarChart.js

@@ -113,16 +113,23 @@ define([
                         display: this.showLegend,
                         labels : { fontFamily : this._font }
                     },
+                    scale: {
+                        ticks: {
+                            yAxes: [{
+                                ticks: {
+                                    fontFamily: this._font,
+                                    beginAtZero: this.scaleBeginAtZero
+                                }
+                            }]
+                        }
+                    },
 
                     //Boolean - Show a backdrop to the scale label
                     scaleShowLabelBackdrop : this.polarScaleShowLabelBackdrop,
 
                     //String - The colour of the label backdrop
                     scaleBackdropColor : this.polarScaleBackdropColor,
 
-                    // Boolean - Whether the scale should begin at zero
-                    scaleBeginAtZero : this.polarScaleBeginAtZero,
-
                     //Number - The backdrop padding above & below the label in pixels
                     scaleBackdropPaddingY : this.polarScaleBackdropPaddingY,
 

src/ChartJS/widgets/RadarChart/widget/RadarChart.js

@@ -129,6 +129,17 @@ define([
                             labels : { fontFamily : this._font }
                         },
 
+                        scale: {
+                            ticks: {
+                                yAxes: [{
+                                    ticks: {
+                                        fontFamily: this._font,
+                                        beginAtZero: this.scaleBeginAtZero
+                                    }
+                                }]
+                            }
+                        },
+
                         //Boolean - Whether to show lines for each scale point
                         scaleShowLine : this.scaleShowLine,
 
@@ -138,9 +149,6 @@ define([
                         //Boolean - Whether to show labels on the scale
                         scaleShowLabels : this.scaleShowLabels,
 
-                        // Boolean - Whether the scale should begin at zero
-                        scaleBeginAtZero : this.scaleBeginAtZero,
-
                         //String - Colour of the angle line
                         angleLineColor : this.angleLineColor,
 

src/ChartJS/widgets/StackedBarChart/widget/StackedBarChart.js

@@ -138,8 +138,8 @@ define([
                                     fontFamily: this._font
                                 },
                                 ticks: {
-                                    fontFamily: this._font
-                                    //suggestedMax: 10
+                                    fontFamily: this._font,
+                                    beginAtZero: this.scaleBeginAtZero
                                 }
                             }]
                         },
@@ -158,9 +158,6 @@ define([
                         //Boolean - Whether to show labels on the scale
                         scaleShowLabels : this.scaleShowLabels,
 
-                        //Boolean - Whether the scale should start at zero, or an order of magnitude down from the lowest value
-                        scaleBeginAtZero : this.scaleBeginAtZero,
-
                         //Boolean - Whether grid lines are shown across the chart
                         scaleShowGridLines : this.scaleShowGridLines,