#581 adding back preexisting defaulting mechanisms to pass preexisting test cases

Author: monfera

src/traces/scatter/line_defaults.js

@@ -15,15 +15,16 @@ var colorscaleDefaults = require('../../components/colorscale/defaults');
 
 // common to 'scatter', 'scatter3d', 'scattergeo' and 'scattergl'
 module.exports = function lineDefaults(traceIn, traceOut, defaultColor, layout, coerce) {
+    
     var markerColor = (traceIn.marker || {}).color;
 
-    if(traceIn.line) defaultColor = markerColor;
-
-    coerce('line.color', defaultColor);
     if(hasColorscale(traceIn, 'line')) {
         colorscaleDefaults(
             traceIn, traceOut, layout, coerce, {prefix: 'line.', cLetter: 'c'}
         );
+    } else {
+        coerce('line.color', (Array.isArray(markerColor) ? false : markerColor) ||
+            defaultColor);
     }
 
 

src/traces/scatter/marker_defaults.js

@@ -19,8 +19,7 @@ var subTypes = require('./subtypes');
 // common to 'scatter', 'scatter3d', 'scattergeo' and 'scattergl'
 module.exports = function markerDefaults(traceIn, traceOut, defaultColor, layout, coerce) {
     var isBubble = subTypes.isBubble(traceIn),
-        // TEMPORARILY HOLDING OFF ON THE DEFAULTING
-        lineColor = ({}).color, // lineColor = (traceIn.line || {}).color,
+        lineColor = (traceIn.line || {}).color,
         defaultMLC;
 
     if(lineColor) defaultColor = lineColor;