Update controllers

diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index 696b67ad873a967b4126294fcb95c85a3e426979..1aca0df2e2e5758f7678074c0089e4870c22cf00 100644 (file)
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -139,14 +139,14 @@
                                if (value < 0) {
                                        for (var i = 0; i < datasetIndex; i++) {
                                                var negDS = this.chart.data.datasets[i];
-                                               if (helpers.isDatasetVisible(negDS) && negDS.yAxisID === yScale.id) {
+                                               if (helpers.isDatasetVisible(negDS) && negDS.yAxisID === yScale.id && negDS.bar) {
                                                        base += negDS.data[index] < 0 ? negDS.data[index] : 0;
                                                }
                                        }
                                } else {
                                        for (var j = 0; j < datasetIndex; j++) {
                                                var posDS = this.chart.data.datasets[j];
-                                               if (helpers.isDatasetVisible(posDS) && posDS.yAxisID === yScale.id) {
+                                               if (helpers.isDatasetVisible(posDS) && posDS.yAxisID === yScale.id && posDS.bar) {
                                                        base += posDS.data[index] > 0 ? posDS.data[index] : 0;
                                                }
                                        }
@@ -200,16 +200,9 @@
                },
 
                calculateBarWidth: function() {
-
                        var xScale = this.getScaleForId(this.getDataset().xAxisID);
                        var ruler = this.getRuler();
-
-                       if (xScale.options.stacked) {
-                               return ruler.categoryWidth;
-                       }
-
-                       return ruler.barWidth;
-
+                       return xScale.options.stacked ? ruler.categoryWidth : ruler.barWidth;
                },
 
                // Get bar index from the given dataset index accounting for the fact that not all bars are visible
@@ -261,7 +254,7 @@
 
                                for (var i = 0; i < datasetIndex; i++) {
                                        var ds = this.chart.data.datasets[i];
-                                       if (helpers.isDatasetVisible(ds)) {
+                                       if (helpers.isDatasetVisible(ds) && ds.bar && ds.yAxisID === yScale.id) {
                                                if (ds.data[index] < 0) {
                                                        sumNeg += ds.data[index] || 0;
                                                } else {

diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js
index 4776f7f73b08147b0fc39ecefe7ebc96dc9fd1ef..3e87c9532cd41aeeca83bce88198d13611b6217a 100644 (file)
--- a/src/controllers/controller.line.js
+++ b/src/controllers/controller.line.js
@@ -206,7 +206,7 @@
 
                                for (var i = this.chart.data.datasets.length - 1; i > datasetIndex; i--) {
                                        var ds = this.chart.data.datasets[i];
-                                       if (helpers.isDatasetVisible(ds)) {
+                                       if (ds.type === 'line' && helpers.isDatasetVisible(ds)) {
                                                if (ds.data[index] < 0) {
                                                        sumNeg += ds.data[index] || 0;
                                                } else {