Changes for fillgradients based on first review

- removed assert
- renamed new mocks and baselines
- used local variable instead of direct reference to trace property
- added trailing newlines to new mock .json files

Author: lumip

src/components/drawing/index.js

@@ -179,6 +179,7 @@ drawing.dashStyle = function(dash, lineWidth) {
 
 function setFillStyle(sel, trace, gd, forLegend) {
     var markerPattern = trace.fillpattern;
+    var fillgradient = trace.fillgradient;
     var patternShape = markerPattern && drawing.getPatternAttr(markerPattern.shape, 0, '');
     if(patternShape) {
         var patternBGColor = drawing.getPatternAttr(markerPattern.bgcolor, 0, null);
@@ -192,32 +193,32 @@ function setFillStyle(sel, trace, gd, forLegend) {
             undefined, markerPattern.fillmode,
             patternBGColor, patternFGColor, patternFGOpacity
         );
-    } else if(trace.fillgradient && trace.fillgradient.orientation !== 'none') {
-        var direction = trace.fillgradient.orientation;
+    } else if(fillgradient && fillgradient.orientation !== 'none') {
+        var direction = fillgradient.orientation;
         var gradientID = 'scatterfill-' + trace.uid;
         if(forLegend) {
             gradientID = 'legendfill-' + trace.uid;
         }
 
-        if(!forLegend && (trace.fillgradient.start !== undefined || trace.fillgradient.stop !== undefined)) {
+        if(!forLegend && (fillgradient.start !== undefined || fillgradient.stop !== undefined)) {
             var start, stop;
             if(direction === 'horizontal') {
                 start = {
-                    x: trace.fillgradient.start,
+                    x: fillgradient.start,
                     y: 0,
                 };
                 stop = {
-                    x: trace.fillgradient.stop,
+                    x: fillgradient.stop,
                     y: 0,
                 };
             } else if(direction === 'vertical') {
                 start = {
                     x: 0,
-                    y: trace.fillgradient.start,
+                    y: fillgradient.start,
                 };
                 stop = {
                     x: 0,
-                    y: trace.fillgradient.stop,
+                    y: fillgradient.stop,
                 };
             }
 
@@ -234,12 +235,12 @@ function setFillStyle(sel, trace, gd, forLegend) {
             stop.y = trace._yA.c2p(
                 (stop.y === undefined) ? trace._extremes.y.max[0].val : stop.y, true
             );
-            sel.call(gradientWithBounds, gd, gradientID, 'linear', trace.fillgradient.colorscale, 'fill', start, stop, true, false);
+            sel.call(gradientWithBounds, gd, gradientID, 'linear', fillgradient.colorscale, 'fill', start, stop, true, false);
         } else {
             if(direction === 'horizontal') {
                 direction = direction + 'reversed';
             }
-            sel.call(drawing.gradient, gd, gradientID, direction, trace.fillgradient.colorscale, 'fill');
+            sel.call(drawing.gradient, gd, gradientID, direction, fillgradient.colorscale, 'fill');
         }
     } else if(trace.fillcolor) {
         sel.call(Color.fill, trace.fillcolor);

src/traces/scatter/attributes.js

@@ -443,7 +443,6 @@ module.exports = {
         colorscale: {
             valType: 'colorscale',
             editType: 'style',
-            anim: true,
             description: [
                 'Sets the fill gradient colors as a color scale.',
                 'The color scale is interpreted as a gradient',
@@ -453,7 +452,7 @@ module.exports = {
                 'distant point from it, if orientation is *radial*.'
             ].join(' ')
         },
-        editType: 'style',
+        editType: 'calc',
         description: [
             'Sets a fill gradient.',
             'If not specified, the fillcolor is used instead.'

src/traces/scatter/fillcolor_defaults.js

@@ -2,10 +2,8 @@
 
 var Color = require('../../components/color');
 var isArrayOrTypedArray = require('../../lib').isArrayOrTypedArray;
-var assert = require('assert');
 
 function averageColors(colorscale) {
-    assert(colorscale.length >= 2);
     var color = Color.interpolate(colorscale[0][1], colorscale[1][1], 0.5);
     for(var i = 2; i < colorscale.length; i++) {
         var averageColorI = Color.interpolate(colorscale[i - 1][1], colorscale[i][1], 0.5);

test/image/baselines/scatter_fill_gradient_tonext.png renamed to test/image/baselines/zz-scatter_fill_gradient_tonext.png

@@ -39,4 +39,4 @@
         "title": { "text": "Scatter traces with radial color gradient fills" },
         "showlegend": true
     }
-}
+}

test/image/baselines/scatter_fill_gradient_tonexty_toself.png renamed to test/image/baselines/zz-scatter_fill_gradient_tonexty_toself.png

@@ -78,4 +78,4 @@
         "title": { "text": "Scatter traces with linear color gradient fills" },
         "showlegend": true
     }
-}
+}