new scatter mocks & fix for scattergl

Author: archmoj

src/traces/scattergl/defaults.js

@@ -55,14 +55,17 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         handleTextDefaults(traceIn, traceOut, layout, coerce);
     }
 
+    var lineColor = (traceOut.line || {}).color;
+    var markerColor = (traceOut.marker || {}).color;
+
     coerce('fill');
     if(traceOut.fill !== 'none') {
         handleFillColorDefaults(traceIn, traceOut, defaultColor, coerce);
     }
 
     var errorBarsSupplyDefaults = Registry.getComponentMethod('errorbars', 'supplyDefaults');
-    errorBarsSupplyDefaults(traceIn, traceOut, defaultColor, {axis: 'y'});
-    errorBarsSupplyDefaults(traceIn, traceOut, defaultColor, {axis: 'x', inherit: 'y'});
+    errorBarsSupplyDefaults(traceIn, traceOut, lineColor || markerColor || defaultColor, {axis: 'y'});
+    errorBarsSupplyDefaults(traceIn, traceOut, lineColor || markerColor || defaultColor, {axis: 'x', inherit: 'y'});
 
     Lib.coerceSelectionMarkerOpacity(traceOut, coerce);
 };

test/image/mocks/gl2d_scatter_error_bars_inherit_color.json

@@ -2,7 +2,7 @@
   "data": [
     {
       "x": [0, 1, 2, 3, 4],
-      "y": [100, 200, 600, 700, 100],
+      "y": [0, 100, 500, 600, 0],
       "type": "scatter",
       "mode": "markers+lines",
       "error_y": {
@@ -11,7 +11,7 @@
     },
     {
       "x": [0, 1, 2, 3, 4],
-      "y": [0, 100, 500, 600, 0],
+      "y": [100, 200, 600, 700, 100],
       "type": "scatter",
       "mode": "markers+lines",
       "marker": {
@@ -30,7 +30,7 @@
       "type": "scatter",
       "mode": "markers+lines",
       "marker": {
-        "color": "green"
+        "color": "red"
       },
       "error_y": {
         "type": "sqrt"
@@ -42,7 +42,7 @@
       "type": "scatter",
       "mode": "markers+lines",
       "line": {
-        "color": "red"
+        "color": "green"
       },
       "error_y": {
         "type": "sqrt"
@@ -54,10 +54,10 @@
       "type": "scatter",
       "mode": "markers+lines",
       "line": {
-        "color": "red"
+        "color": "blue"
       },
       "marker": {
-        "color": "green"
+        "color": "black"
       },
       "error_y": {
         "type": "sqrt"

test/image/mocks/gl2d_scattergl_error_bars_inherit_color.json

@@ -0,0 +1,74 @@
+{
+  "data": [
+    {
+      "x": [0, 1, 2, 3, 4],
+      "y": [0, 100, 500, 600, 0],
+      "type": "scattergl",
+      "mode": "markers+lines",
+      "error_y": {
+        "type": "sqrt"
+      }
+    },
+    {
+      "x": [0, 1, 2, 3, 4],
+      "y": [100, 200, 600, 700, 100],
+      "type": "scattergl",
+      "mode": "markers+lines",
+      "marker": {
+        "line": {
+          "width": 2,
+          "color": "gray"
+        }
+      },
+      "error_y": {
+        "type": "sqrt"
+      }
+    },
+    {
+      "x": [0, 1, 2, 3, 4],
+      "y": [200, 300, 700, 800, 200],
+      "type": "scattergl",
+      "mode": "markers+lines",
+      "marker": {
+        "color": "red"
+      },
+      "error_y": {
+        "type": "sqrt"
+      }
+    },
+    {
+      "x": [0, 1, 2, 3, 4],
+      "y": [300, 400, 800, 900, 300],
+      "type": "scattergl",
+      "mode": "markers+lines",
+      "line": {
+        "color": "green"
+      },
+      "error_y": {
+        "type": "sqrt"
+      }
+    },
+    {
+      "x": [0, 1, 2, 3, 4],
+      "y": [400, 500, 900, 1000, 400],
+      "type": "scattergl",
+      "mode": "markers+lines",
+      "line": {
+        "color": "blue"
+      },
+      "marker": {
+        "color": "black"
+      },
+      "error_y": {
+        "type": "sqrt"
+      }
+    }
+  ],
+  "layout": {
+      "width": 600,
+      "heigh": 600,
+      "title": {
+          "text": "Scatter-gl error bars inherit color from line or marker"
+      }
+  }
+}

test/image/mocks/gl3d_scatter3d_error_bars_inherit_color.json

@@ -33,7 +33,7 @@
         "type": "scatter3d",
         "mode": "markers+lines",
         "marker": {
-          "color": "green"
+          "color": "red"
         },
         "error_y": {
           "type": "sqrt"
@@ -46,7 +46,7 @@
         "type": "scatter3d",
         "mode": "markers+lines",
         "line": {
-          "color": "red"
+          "color": "green"
         },
         "error_y": {
           "type": "sqrt"
@@ -59,10 +59,10 @@
         "type": "scatter3d",
         "mode": "markers+lines",
         "line": {
-          "color": "red"
+          "color": "blue"
         },
         "marker": {
-          "color": "green"
+          "color": "black"
         },
         "error_y": {
           "type": "sqrt"