Merge branch 'development' of ssh://github.com/rik-bos/ChartJS into rik-bos-development

Jelte Lagendijk · Jelte Lagendijk · commit 3d6e2566cc94 · 2017-05-10T11:35:22.000+02:00
diff --git a/src/ChartJS/widgets/BarChart/widget/BarChart.js b/src/ChartJS/widgets/BarChart/widget/BarChart.js
@@ -166,7 +166,6 @@ define([
 
                 if (this.scaleBeginAtZero) {
                     chartProperties.options.scales.yAxes[0].ticks.suggestedMin = 0;
-                    chartProperties.options.scales.yAxes[0].ticks.suggestedMax = 4;
                 }
 
                 this._chart = new this._chartJS(this._ctx, chartProperties);
diff --git a/src/ChartJS/widgets/LineChart/widget/LineChart.js b/src/ChartJS/widgets/LineChart/widget/LineChart.js
@@ -209,7 +209,6 @@ define([
 
                 if (this.scaleBeginAtZero) {
                     chartProperties.options.scales.yAxes[0].ticks.suggestedMin = 0;
-                    chartProperties.options.scales.yAxes[0].ticks.suggestedMax = 4;
                 }
 
                 this._chart = new this._chartJS(this._ctx, chartProperties);
diff --git a/src/ChartJS/widgets/StackedBarChart/widget/StackedBarChart.js b/src/ChartJS/widgets/StackedBarChart/widget/StackedBarChart.js
@@ -174,7 +174,6 @@ define([
 
                 if (this.scaleBeginAtZero) {
                     chartProperties.options.scales.yAxes[0].ticks.suggestedMin = 0;
-                    chartProperties.options.scales.yAxes[0].ticks.suggestedMax = 4;
                 }
 
                 this._chart = new this._chartJS(this._ctx, chartProperties);
diff --git a/test/widgets/ChartJS.mpk b/test/widgets/ChartJS.mpk

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,6 @@ define([`
`166`	`166`
`167`	`167`	`if (this.scaleBeginAtZero) {`
`168`	`168`	`chartProperties.options.scales.yAxes[0].ticks.suggestedMin = 0;`
`169`		`- chartProperties.options.scales.yAxes[0].ticks.suggestedMax = 4;`
`170`	`169`	`}`
`171`	`170`
`172`	`171`	`this._chart = new this._chartJS(this._ctx, chartProperties);`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,6 @@ define([`
`209`	`209`
`210`	`210`	`if (this.scaleBeginAtZero) {`
`211`	`211`	`chartProperties.options.scales.yAxes[0].ticks.suggestedMin = 0;`
`212`		`- chartProperties.options.scales.yAxes[0].ticks.suggestedMax = 4;`
`213`	`212`	`}`
`214`	`213`
`215`	`214`	`this._chart = new this._chartJS(this._ctx, chartProperties);`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,6 @@ define([`
`174`	`174`
`175`	`175`	`if (this.scaleBeginAtZero) {`
`176`	`176`	`chartProperties.options.scales.yAxes[0].ticks.suggestedMin = 0;`
`177`		`- chartProperties.options.scales.yAxes[0].ticks.suggestedMax = 4;`
`178`	`177`	`}`
`179`	`178`
`180`	`179`	`this._chart = new this._chartJS(this._ctx, chartProperties);`