From: coolbombom <cool_bombom@hotmail.com>
Date: Mon, 11 Jan 2016 11:48:09 +0000 (+0100)
Subject: I will try again!
X-Git-Tag: v1.1.0~9^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1886%2Fhead;p=thirdparty%2FChart.js.git

I will try again!

had a bad effect on color that was not array .... fully tested now, is working in my solution!
---

diff --git a/src/Chart.Bar.js b/src/Chart.Bar.js
index f74ee1955..c38d2525c 100644
--- a/src/Chart.Bar.js
+++ b/src/Chart.Bar.js
@@ -115,10 +115,10 @@
 						value : dataPoint,
 						label : data.labels[index],
 						datasetLabel: dataset.label,
-						strokeColor : dataset.strokeColor[index] || dataset.strokeColor,
-						fillColor : dataset.fillColor[index] || dataset.fillColor,
-						highlightFill : (dataset.highlightFill) ? dataset.highlightFill[index] || dataset.highlightFill : dataset.fillColor[index] || dataset.fillColor,
-						highlightStroke : (dataset.highlightStroke) ? dataset.highlightStroke[index] || dataset.highlightStroke : dataset.strokeColor[index] || dataset.strokeColor
+						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
 					}));
 				},this);