From 31b883f815cd96ba07b21c375d8e19136bfe6b15 Mon Sep 17 00:00:00 2001 From: Eric Mikula Date: Sun, 3 Apr 2016 15:19:21 -0400 Subject: [PATCH] Changing object type check to prevent errors when undefined. Fixes #2213 --- src/Chart.Bar.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Chart.Bar.js b/src/Chart.Bar.js index 7820a320b..3be768bc2 100644 --- a/src/Chart.Bar.js +++ b/src/Chart.Bar.js @@ -117,10 +117,10 @@ value : dataPoint, label : data.labels[index], datasetLabel: dataset.label, - strokeColor : (typeof dataset.strokeColor != 'string') ? dataset.strokeColor[index] : dataset.strokeColor, - fillColor : (typeof dataset.fillColor != 'string') ? dataset.fillColor[index] : dataset.fillColor, - highlightFill : (dataset.highlightFill) ? (typeof dataset.highlightFill != 'string') ? dataset.highlightFill[index] : dataset.highlightFill : (typeof dataset.fillColor != 'string') ? dataset.fillColor[index] : dataset.fillColor, - highlightStroke : (dataset.highlightStroke) ? (typeof dataset.highlightStroke != 'string') ? dataset.highlightStroke[index] : dataset.highlightStroke : (typeof dataset.strokeColor != 'string') ? dataset.strokeColor[index] : dataset.strokeColor + strokeColor : (typeof dataset.strokeColor == 'object') ? dataset.strokeColor[index] : dataset.strokeColor, + fillColor : (typeof dataset.fillColor == 'object') ? dataset.fillColor[index] : dataset.fillColor, + highlightFill : (dataset.highlightFill) ? (typeof dataset.highlightFill == 'object') ? dataset.highlightFill[index] : dataset.highlightFill : (typeof dataset.fillColor == 'object') ? dataset.fillColor[index] : dataset.fillColor, + highlightStroke : (dataset.highlightStroke) ? (typeof dataset.highlightStroke == 'object') ? dataset.highlightStroke[index] : dataset.highlightStroke : (typeof dataset.strokeColor == 'object') ? dataset.strokeColor[index] : dataset.strokeColor })); },this);