rework based on PR feedback

Author: monfera

src/components/colorscale/calc.js

@@ -16,9 +16,17 @@ var flipScale = require('./flip_scale');
 
 
 module.exports = function calc(trace, vals, containerStr, cLetter) {
+    var container, inputContainer;
+
+    if(containerStr) {
+        container = Lib.nestedProperty(trace, containerStr).get();
+        inputContainer = Lib.nestedProperty(trace._input, containerStr).get();
+    } else {
+        container = trace;
+        inputContainer = trace._input;
+    }
 
-    var container = containerStr ? Lib.nestedProperty(trace, containerStr).get() : trace,
-        auto = container[cLetter + 'auto'],
+    var auto = container[cLetter + 'auto'],
         min = container[cLetter + 'min'],
         max = container[cLetter + 'max'],
         scl = container.colorscale;
@@ -39,12 +47,16 @@ module.exports = function calc(trace, vals, containerStr, cLetter) {
     container[cLetter + 'min'] = min;
     container[cLetter + 'max'] = max;
 
+    inputContainer[cLetter + 'min'] = min;
+    inputContainer[cLetter + 'max'] = max;
+
     if(container.autocolorscale) {
         if(min * max < 0) scl = scales.RdBu;
         else if(min >= 0) scl = scales.Reds;
         else scl = scales.Blues;
 
         // reversescale is handled at the containerOut level
+        inputContainer.colorscale = scl;
         if(container.reversescale) scl = flipScale(scl);
         container.colorscale = scl;
     }

src/traces/scatter/line_defaults.js

@@ -18,8 +18,6 @@ module.exports = function lineDefaults(traceIn, traceOut, defaultColor, layout,
 
     var markerColor = (traceIn.marker || {}).color;
 
-    //if(traceIn.line) defaultColor = markerColor;
-
     coerce('line.color', defaultColor);
     if(hasColorscale(traceIn, 'line')) {
         colorscaleDefaults(

src/traces/scatter/marker_defaults.js

@@ -19,20 +19,16 @@ 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),
-        lineColor = (traceIn.line || {}).color,
-        lineColorscale = (traceIn.line || {}).colorscale,
-        defaultColorscale,
+        lineColor = !Array.isArray(traceIn.line) ? (traceIn.line || {}).color : undefined,
         defaultMLC;
 
     if(lineColor) defaultColor = lineColor;
-    if(lineColorscale) defaultColorscale = lineColorscale;
 
     coerce('marker.symbol');
     coerce('marker.opacity', isBubble ? 0.7 : 1);
     coerce('marker.size');
 
     coerce('marker.color', defaultColor);
-    coerce('marker.colorscale', defaultColorscale);
     if(hasColorscale(traceIn, 'marker')) {
         colorscaleDefaults(
             traceIn, traceOut, layout, coerce, {prefix: 'marker.', cLetter: 'c'}

test/image/baselines/gl3d_scatter-color-palette-with-default-marker.png

@@ -15,7 +15,7 @@
     "type":"scatter3d"
   }],
   "layout": {
-    "title": "Markers should default to line color, partly to evade Z fighting",
+    "title": "Markers do not default to line color",
     "height":758,
     "width":1310
   }