]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
I will try again! 1886/head
authorcoolbombom <cool_bombom@hotmail.com>
Mon, 11 Jan 2016 11:48:09 +0000 (12:48 +0100)
committercoolbombom <cool_bombom@hotmail.com>
Mon, 11 Jan 2016 11:48:09 +0000 (12:48 +0100)
had a bad effect on color that was not array .... fully tested now, is working in my solution!

src/Chart.Bar.js

index f74ee195506bdf0aa5297cfd39104a8e4fbafbd8..c38d2525c0cb1777c880f35c72a8de362d43034f 100644 (file)
                                                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);