lint: mostly un-tersing some ternaries

Author: etpinard

src/components/colorscale/calc.js

@@ -21,7 +21,8 @@ module.exports = function calc(trace, vals, containerStr, cLetter) {
     if(containerStr) {
         container = Lib.nestedProperty(trace, containerStr).get();
         inputContainer = Lib.nestedProperty(trace._input, containerStr).get();
-    } else {
+    }
+    else {
         container = trace;
         inputContainer = trace._input;
     }

src/traces/scatter/colorscale_calc.js

@@ -15,21 +15,15 @@ var calcColorscale = require('../../components/colorscale/calc');
 var subTypes = require('./subtypes');
 
 
-// common to 'scatter', 'scatter3d' and 'scattergeo'
 module.exports = function calcMarkerColorscale(trace) {
-
-    // auto-z and autocolorscale if applicable
-
     if(subTypes.hasLines(trace) && hasColorscale(trace, 'line')) {
         calcColorscale(trace, trace.line.color, 'line', 'c');
     }
 
     if(subTypes.hasMarkers(trace)) {
-
         if(hasColorscale(trace, 'marker')) {
             calcColorscale(trace, trace.marker.color, 'marker', 'c');
         }
-
         if(hasColorscale(trace, 'marker.line')) {
             calcColorscale(trace, trace.marker.line.color, 'marker.line', 'c');
         }

src/traces/scatter/line_defaults.js

@@ -13,21 +13,18 @@ var hasColorscale = require('../../components/colorscale/has_colorscale');
 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;
 
     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);
+        colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: 'line.', cLetter: 'c'});
+    }
+    else {
+        var lineColorDflt = (Array.isArray(markerColor) ? false : markerColor) || defaultColor;
+        coerce('line.color', lineColorDflt);
     }
-
 
     coerce('line.width');
     coerce('line.dash');

src/traces/scatter/marker_defaults.js

@@ -16,7 +16,6 @@ var colorscaleDefaults = require('../../components/colorscale/defaults');
 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 = !Array.isArray(traceIn.line) ? (traceIn.line || {}).color : undefined,
@@ -30,9 +29,7 @@ module.exports = function markerDefaults(traceIn, traceOut, defaultColor, layout
 
     coerce('marker.color', defaultColor);
     if(hasColorscale(traceIn, 'marker')) {
-        colorscaleDefaults(
-            traceIn, traceOut, layout, coerce, {prefix: 'marker.', cLetter: 'c'}
-        );
+        colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: 'marker.', cLetter: 'c'});
     }
 
     // if there's a line with a different color than the marker, use
@@ -46,9 +43,7 @@ module.exports = function markerDefaults(traceIn, traceOut, defaultColor, layout
 
     coerce('marker.line.color', defaultMLC);
     if(hasColorscale(traceIn, 'marker.line')) {
-        colorscaleDefaults(
-            traceIn, traceOut, layout, coerce, {prefix: 'marker.line.', cLetter: 'c'}
-        );
+        colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: 'marker.line.', cLetter: 'c'});
     }
 
     coerce('marker.line.width', isBubble ? 1 : 0);