From: Pikamander2 <Pikamander2@gmail.com>
Date: Thu, 1 Sep 2016 06:18:42 +0000 (-0400)
Subject: Fix zero border width not working (issue #3241)
X-Git-Tag: v2.3.0-rc.1~1^2~17^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2002ca058bdc05cea8742ce109e6ebd8b3f97316;p=thirdparty%2FChart.js.git

Fix zero border width not working (issue #3241)
---

diff --git a/src/core/core.legend.js b/src/core/core.legend.js
index a13151bd3..8d1fb4b7e 100644
--- a/src/core/core.legend.js
+++ b/src/core/core.legend.js
@@ -324,6 +324,7 @@ module.exports = function(Chart) {
 					ctx.lineJoin = itemOrDefault(legendItem.lineJoin, lineDefault.borderJoinStyle);
 					ctx.lineWidth = itemOrDefault(legendItem.lineWidth, lineDefault.borderWidth);
 					ctx.strokeStyle = itemOrDefault(legendItem.strokeStyle, globalDefault.defaultColor);
+					var isLineWidthZero = (itemOrDefault(legendItem.lineWidth, lineDefault.borderWidth) == 0);
 
 					if (ctx.setLineDash) {
 						// IE 9 and 10 do not support line dash
@@ -343,7 +344,10 @@ module.exports = function(Chart) {
 					}
 					else {
 						// Draw box as legend symbol
-						ctx.strokeRect(x, y, boxWidth, fontSize);
+						if (!isLineWidthZero)
+						{
+								ctx.strokeRect(x, y, boxWidth, fontSize);
+						}
 						ctx.fillRect(x, y, boxWidth, fontSize);
 					}