Log scale + tests

diff --git a/src/scales/scale.linear.js b/src/scales/scale.linear.js
index 9b6200ef7ae01c427dbe9fd4e3089ea9b3485a37..ac8954fa1208ceefbc0049002c99cddf2bff7e87 100644 (file)
--- a/src/scales/scale.linear.js
+++ b/src/scales/scale.linear.js
@@ -83,8 +83,10 @@
 
                                helpers.each(valuesPerType, function(valuesForType) {
                                        var values = valuesForType.positiveValues.concat(valuesForType.negativeValues);
-                                       this.min = Math.min(this.min, helpers.min(values));
-                                       this.max = Math.max(this.max, helpers.max(values));
+                                       var minVal = helpers.min(values);
+                                       var maxVal = helpers.max(values);
+                                       this.min = this.min === null ? minVal : Math.min(this.min, minVal);
+                                       this.max = this.max === null ? maxVal : Math.max(this.max, maxVal);
                                }, this);
 
                        } else {

diff --git a/src/scales/scale.logarithmic.js b/src/scales/scale.logarithmic.js
index 9de8e1d4e5504d007477f8fbc8187de643397f14..467a4cc8bf7558ef58f7652b51b104ca250d2cb2 100644 (file)
--- a/src/scales/scale.logarithmic.js
+++ b/src/scales/scale.logarithmic.js
@@ -30,13 +30,17 @@
                        this.min = null;
                        this.max = null;
 
-                       var values = [];
-
                        if (this.options.stacked) {
+                               var valuesPerType = {};
+
                                helpers.each(this.data.datasets, function(dataset) {
                                        if (helpers.isDatasetVisible(dataset) && (this.isHorizontal() ? dataset.xAxisID === this.id : dataset.yAxisID === this.id)) {
-                                               helpers.each(dataset.data, function(rawValue, index) {
+                                               if (valuesPerType[dataset.type] === undefined) {
+                                                       valuesPerType[dataset.type] = [];
+                                               }
 
+                                               helpers.each(dataset.data, function(rawValue, index) {
+                                                       var values = valuesPerType[dataset.type];
                                                        var value = this.getRightValue(rawValue);
                                                        if (isNaN(value)) {
                                                                return;
@@ -54,8 +58,12 @@
                                        }
                                }, this);
 
-                               this.min = helpers.min(values);
-                               this.max = helpers.max(values);
+                               helpers.each(valuesPerType, function(valuesForType) {
+                                       var minVal = helpers.min(valuesForType);
+                                       var maxVal = helpers.max(valuesForType);
+                                       this.min = this.min === null ? minVal : Math.min(this.min, minVal);
+                                       this.max = this.max === null ? maxVal : Math.max(this.max, maxVal);
+                               }, this);
 
                        } else {
                                helpers.each(this.data.datasets, function(dataset) {

diff --git a/test/scale.logarithmic.tests.js b/test/scale.logarithmic.tests.js
index 72250df73ba0832984c0b39ce596a23dff7a3b9c..7493e3de6302f29ae17c6955c710a1a7a1f4b415 100644 (file)
--- a/test/scale.logarithmic.tests.js
+++ b/test/scale.logarithmic.tests.js
@@ -175,13 +175,19 @@ describe('Logarithmic Scale tests', function() {
                var mockData = {
                        datasets: [{
                                yAxisID: scaleID,
-                               data: [10, 5, 1, 5, 78, 100]
+                               data: [10, 5, 1, 5, 78, 100],
+                               type: 'bar'
                        }, {
                                yAxisID: 'second scale',
                                data: [-1000, 1000],
                        }, {
                                yAxisID: scaleID,
-                               data: [150, 10, 10, 100, 10, 9]
+                               data: [150, 10, 10, 100, 10, 9],
+                               type: 'bar'
+                       }, {
+                               yAxisID: scaleID,
+                               data: [100, 100, 100, 100, 100, 100],
+                               type: 'line'
                        }]
                };
 
@@ -208,17 +214,21 @@ describe('Logarithmic Scale tests', function() {
                var mockData = {
                        datasets: [{
                                yAxisID: scaleID,
-                               data: [10, 5, 1, 5, 78, 100]
+                               data: [10, 5, 1, 5, 78, 100],
+                               type: 'bar'
                        }, {
                                yAxisID: 'second scale',
                                data: [-1000, 1000],
+                               type: 'bar'
                        }, {
                                yAxisID: scaleID,
-                               data: [150, 10, 10, 100, 10, 9]
+                               data: [150, 10, 10, 100, 10, 9],
+                               type: 'bar'
                        }, {
                                yAxisID: scaleID,
                                data: [10000, 10000, 10000, 10000, 10000, 10000],
-                               hidden: true
+                               hidden: true,
+                               type: 'bar'
                        }]
                };