From 5d0d93025221ed8590b68aee45572b19181ed976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= <etienne@plot.ly>
Date: Mon, 9 Jan 2017 13:17:54 -0500
Subject: [PATCH 1/6] look in calcdata item for 'mc' and 'mlc' in bar legend
 style

---
 src/components/legend/style.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/legend/style.js b/src/components/legend/style.js
index 5b2c65dfa85..7f1da29106a 100644
--- a/src/components/legend/style.js
+++ b/src/components/legend/style.js
@@ -172,13 +172,14 @@ function styleBars(d) {
     barpath.exit().remove();
     barpath.each(function(d) {
         var w = (d.mlw + 1 || markerLine.width + 1) - 1,
-            p = d3.select(this);
+            p = d3.select(this),
+            d0 = d[0];
 
         p.style('stroke-width', w + 'px')
-            .call(Color.fill, d.mc || marker.color);
+            .call(Color.fill, d0.mc || marker.color);
 
         if(w) {
-            p.call(Color.stroke, d.mlc || markerLine.color);
+            p.call(Color.stroke, d0.mlc || markerLine.color);
         }
     });
 }

From 733d2b386834ebb6a434de65703fe866c61cd07d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= <etienne@plot.ly>
Date: Mon, 9 Jan 2017 13:19:30 -0500
Subject: [PATCH 2/6] rm calcdata items logic in box legend style

- as box traces don't have arrayOk style attribute at the moment
---
 src/components/legend/style.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/legend/style.js b/src/components/legend/style.js
index 7f1da29106a..1414d10745f 100644
--- a/src/components/legend/style.js
+++ b/src/components/legend/style.js
@@ -195,14 +195,14 @@ function styleBoxes(d) {
         .attr('transform', 'translate(20,0)');
     pts.exit().remove();
     pts.each(function(d) {
-        var w = (d.lw + 1 || trace.line.width + 1) - 1,
+        var w = trace.line.width,
             p = d3.select(this);
 
         p.style('stroke-width', w + 'px')
-            .call(Color.fill, d.fc || trace.fillcolor);
+            .call(Color.fill, trace.fillcolor);
 
         if(w) {
-            p.call(Color.stroke, d.lc || trace.line.color);
+            p.call(Color.stroke, trace.line.color);
         }
     });
 }

From 2877c3d47d2176d3c85db95ced4ff8c48347ebd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= <etienne@plot.ly>
Date: Mon, 9 Jan 2017 13:32:14 -0500
Subject: [PATCH 3/6] add legend to bar_marker_array mock

---
 test/image/baselines/bar_marker_array.png | Bin 14620 -> 15364 bytes
 test/image/mocks/bar_marker_array.json    |   5 ++++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/image/baselines/bar_marker_array.png b/test/image/baselines/bar_marker_array.png
index 69e75166fbf64fa2ca8679386e33afd8e650500d..4a945d06dce25916c6fff5b85631ab4a38526641 100644
GIT binary patch
literal 15364
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
V71<vN{<~Ld_fDrB#lL%>`wxCn12+Hw

literal 14620
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

diff --git a/test/image/mocks/bar_marker_array.json b/test/image/mocks/bar_marker_array.json
index 694383900a6..07c3a2d20e6 100644
--- a/test/image/mocks/bar_marker_array.json
+++ b/test/image/mocks/bar_marker_array.json
@@ -23,5 +23,8 @@
       },
       "type": "bar"
     }
-  ]
+  ],
+  "layout": {
+    "showlegend": true
+  }
 }

From 6de37eed3633659bc5b5d289a14a7816ac1983dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= <etienne@plot.ly>
Date: Mon, 9 Jan 2017 16:08:40 -0500
Subject: [PATCH 4/6] lint (rm unused var)

---
 src/components/legend/style.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/legend/style.js b/src/components/legend/style.js
index 1414d10745f..c106390805f 100644
--- a/src/components/legend/style.js
+++ b/src/components/legend/style.js
@@ -194,7 +194,7 @@ function styleBoxes(d) {
         .attr('d', 'M6,6H-6V-6H6Z')
         .attr('transform', 'translate(20,0)');
     pts.exit().remove();
-    pts.each(function(d) {
+    pts.each(function() {
         var w = trace.line.width,
             p = d3.select(this);
 

From 8e718bfcd1265a06a011d5b1a786301ef11b474b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= <etienne@plot.ly>
Date: Tue, 17 Jan 2017 15:23:48 -0500
Subject: [PATCH 5/6] fix legend for bar array marker line width

---
 src/components/legend/style.js            |   6 +++---
 test/image/baselines/bar_marker_array.png | Bin 15364 -> 15583 bytes
 test/image/mocks/bar_marker_array.json    |  10 +++++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/legend/style.js b/src/components/legend/style.js
index c106390805f..4b0107b0f4a 100644
--- a/src/components/legend/style.js
+++ b/src/components/legend/style.js
@@ -171,9 +171,9 @@ function styleBars(d) {
         .attr('transform', 'translate(20,0)');
     barpath.exit().remove();
     barpath.each(function(d) {
-        var w = (d.mlw + 1 || markerLine.width + 1) - 1,
-            p = d3.select(this),
-            d0 = d[0];
+        var p = d3.select(this),
+            d0 = d[0],
+            w = (d0.mlw + 1 || markerLine.width + 1) - 1;
 
         p.style('stroke-width', w + 'px')
             .call(Color.fill, d0.mc || marker.color);
diff --git a/test/image/baselines/bar_marker_array.png b/test/image/baselines/bar_marker_array.png
index 4a945d06dce25916c6fff5b85631ab4a38526641..25e5b4b3a6164af3d90cb46f2e5ebdf91664f36c 100644
GIT binary patch
literal 15583
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

literal 15364
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
V71<vN{<~Ld_fDrB#lL%>`wxCn12+Hw

diff --git a/test/image/mocks/bar_marker_array.json b/test/image/mocks/bar_marker_array.json
index 07c3a2d20e6..d8b908cd81a 100644
--- a/test/image/mocks/bar_marker_array.json
+++ b/test/image/mocks/bar_marker_array.json
@@ -19,7 +19,15 @@
           "#447adb",
           "#db5a44",
           "#447adb"
-        ]
+        ],
+        "line": {
+          "width": [
+            2,
+            3,
+            2,
+            3
+          ]
+        }
       },
       "type": "bar"
     }

From 81d3db1815055e83c9fa3411042fe38caeb5651c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= <etienne@plot.ly>
Date: Tue, 17 Jan 2017 15:55:39 -0500
Subject: [PATCH 6/6] test array marker.line.color in bar marker array mock

---
 test/image/baselines/bar_marker_array.png | Bin 15583 -> 15813 bytes
 test/image/mocks/bar_marker_array.json    |   6 ++++++
 2 files changed, 6 insertions(+)

diff --git a/test/image/baselines/bar_marker_array.png b/test/image/baselines/bar_marker_array.png
index 25e5b4b3a6164af3d90cb46f2e5ebdf91664f36c..08d1cec4a7a1cdc81c8673e7629fc98f952f3e23 100644
GIT binary patch
literal 15813
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

literal 15583
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

diff --git a/test/image/mocks/bar_marker_array.json b/test/image/mocks/bar_marker_array.json
index d8b908cd81a..904d1054a0e 100644
--- a/test/image/mocks/bar_marker_array.json
+++ b/test/image/mocks/bar_marker_array.json
@@ -26,6 +26,12 @@
             3,
             2,
             3
+          ],
+          "color": [
+            "red",
+            "green",
+            "blue",
+            "yellow"
           ]
         }
       },