lint ('comma-spacing', 'key-spacing', some 'space-infix-ops')

Author: etpinard

src/components/legend/index.js

@@ -1,4 +1,3 @@
-
 /**
 * Copyright 2012-2016, Plotly, Inc.
 * All rights reserved.

src/traces/scatter/attributes.js

@@ -77,7 +77,7 @@ module.exports = {
     },
     mode: {
         valType: 'flaglist',
-        flags: ['lines','markers','text'],
+        flags: ['lines', 'markers', 'text'],
         extras: ['none'],
         role: 'info',
         description: [

src/traces/scatter/calc.js

@@ -19,14 +19,17 @@ var calcMarkerColorscale = require('./marker_colorscale_calc');
 
 
 module.exports = function calc(gd, trace) {
-    var xa = Axes.getFromId(gd,trace.xaxis||'x'),
-        ya = Axes.getFromId(gd,trace.yaxis||'y');
+    var xa = Axes.getFromId(gd, trace.xaxis || 'x'),
+        ya = Axes.getFromId(gd, trace.yaxis || 'y');
     Lib.markTime('in Scatter.calc');
-    var x = xa.makeCalcdata(trace,'x');
+
+    var x = xa.makeCalcdata(trace, 'x');
     Lib.markTime('finished convert x');
-    var y = ya.makeCalcdata(trace,'y');
+
+    var y = ya.makeCalcdata(trace, 'y');
     Lib.markTime('finished convert y');
-    var serieslen = Math.min(x.length,y.length),
+
+    var serieslen = Math.min(x.length, y.length),
         marker,
         s,
         i;
@@ -35,13 +38,13 @@ module.exports = function calc(gd, trace) {
     xa._minDtick = 0;
     ya._minDtick = 0;
 
-    if(x.length>serieslen) x.splice(serieslen, x.length-serieslen);
-    if(y.length>serieslen) y.splice(serieslen, y.length-serieslen);
+    if(x.length > serieslen) x.splice(serieslen, x.length - serieslen);
+    if(y.length > serieslen) y.splice(serieslen, y.length - serieslen);
 
     // check whether bounds should be tight, padded, extended to zero...
     // most cases both should be padded on both ends, so start with that.
-    var xOptions = {padded:true},
-        yOptions = {padded:true};
+    var xOptions = {padded: true},
+        yOptions = {padded: true};
 
     if(subTypes.hasMarkers(trace)) {
 
@@ -55,19 +58,19 @@ module.exports = function calc(gd, trace) {
             var ax = {type: 'linear'};
             Axes.setConvert(ax);
             s = ax.makeCalcdata(trace.marker, 'size');
-            if(s.length>serieslen) s.splice(serieslen, s.length-serieslen);
+            if(s.length > serieslen) s.splice(serieslen, s.length - serieslen);
         }
 
-        var sizeref = 1.6*(trace.marker.sizeref||1),
+        var sizeref = 1.6 * (trace.marker.sizeref || 1),
             markerTrans;
-        if(trace.marker.sizemode==='area') {
+        if(trace.marker.sizemode === 'area') {
             markerTrans = function(v) {
-                return Math.max(Math.sqrt((v||0)/sizeref),3);
+                return Math.max(Math.sqrt((v || 0) / sizeref), 3);
             };
         }
         else {
             markerTrans = function(v) {
-                return Math.max((v||0)/sizeref,3);
+                return Math.max((v || 0) / sizeref, 3);
             };
         }
         xOptions.ppad = yOptions.ppad = Array.isArray(s) ?
@@ -80,14 +83,15 @@ module.exports = function calc(gd, trace) {
 
     // include zero (tight) and extremes (padded) if fill to zero
     // (unless the shape is closed, then it's just filling the shape regardless)
-    if((trace.fill==='tozerox' || (trace.fill==='tonextx' && gd.firstscatter)) &&
-            (x[0]!==x[serieslen-1] || y[0]!==y[serieslen-1])) {
+    if(((trace.fill === 'tozerox') ||
+            ((trace.fill === 'tonextx') && gd.firstscatter)) &&
+            ((x[0] !== x[serieslen - 1]) || (y[0] !== y[serieslen - 1]))) {
         xOptions.tozero = true;
     }
 
     // if no error bars, markers or text, or fill to y=0 remove x padding
     else if(!trace.error_y.visible && (
-            ['tonexty', 'tozeroy'].indexOf(trace.fill)!==-1 ||
+            ['tonexty', 'tozeroy'].indexOf(trace.fill) !== -1 ||
             (!subTypes.hasMarkers(trace) && !subTypes.hasText(trace))
         )) {
         xOptions.padded = false;
@@ -97,13 +101,13 @@ module.exports = function calc(gd, trace) {
     // now check for y - rather different logic, though still mostly padded both ends
     // include zero (tight) and extremes (padded) if fill to zero
     // (unless the shape is closed, then it's just filling the shape regardless)
-    if((trace.fill==='tozeroy' || (trace.fill==='tonexty' && gd.firstscatter)) &&
-            (x[0]!==x[serieslen-1] || y[0]!==y[serieslen-1])) {
+    if(((trace.fill === 'tozeroy') || ((trace.fill === 'tonexty') && gd.firstscatter)) &&
+            ((x[0] !== x[serieslen - 1]) || (y[0] !== y[serieslen - 1]))) {
         yOptions.tozero = true;
     }
 
     // tight y: any x fill
-    else if(['tonextx', 'tozerox'].indexOf(trace.fill)!==-1) {
+    else if(['tonextx', 'tozerox'].indexOf(trace.fill) !== -1) {
         yOptions.padded = false;
     }
 

src/traces/scatter/clean_data.js

@@ -21,7 +21,7 @@ module.exports = function cleanData(fullData) {
     for(i = 0; i < fullData.length; i++) {
         tracei = fullData[i];
         filli = tracei.fill;
-        if(filli==='none' || (tracei.type !== 'scatter')) continue;
+        if((filli === 'none') || (tracei.type !== 'scatter')) continue;
         tracei.opacity = undefined;
 
         if(filli === 'tonexty' || filli === 'tonextx') {

src/traces/scatter/colorbar.js

@@ -28,7 +28,7 @@ module.exports = function colorbar(gd, cd) {
     // TODO unify Scatter.colorbar and Heatmap.colorbar
     // TODO make Plotly[module].colorbar support multiple colorbar per trace
 
-    if(marker===undefined || !marker.showscale){
+    if((marker === undefined) || !marker.showscale){
         Plotly.Plots.autoMargin(gd, cbId);
         return;
     }

src/traces/scatter/defaults.js

@@ -68,5 +68,5 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 
 function lineShapeDefaults(traceIn, traceOut, coerce) {
     var shape = coerce('line.shape');
-    if(shape==='spline') coerce('line.smoothing');
+    if(shape === 'spline') coerce('line.smoothing');
 }

src/traces/scatter/hover.js

@@ -19,20 +19,20 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
         trace = cd[0].trace,
         xa = pointData.xa,
         ya = pointData.ya,
-        dx = function(di){
+        dx = function(di) {
             // scatter points: d.mrc is the calculated marker radius
             // adjust the distance so if you're inside the marker it
             // always will show up regardless of point size, but
             // prioritize smaller points
-            var rad = Math.max(3, di.mrc||0);
+            var rad = Math.max(3, di.mrc || 0);
             return Math.max(Math.abs(xa.c2p(di.x)-xa.c2p(xval))-rad, 1-3/rad);
         },
-        dy = function(di){
-            var rad = Math.max(3, di.mrc||0);
+        dy = function(di) {
+            var rad = Math.max(3, di.mrc || 0);
             return Math.max(Math.abs(ya.c2p(di.y)-ya.c2p(yval))-rad, 1-3/rad);
         },
         dxy = function(di) {
-            var rad = Math.max(3, di.mrc||0),
+            var rad = Math.max(3, di.mrc || 0),
                 dx = Math.abs(xa.c2p(di.x)-xa.c2p(xval)),
                 dy = Math.abs(ya.c2p(di.y)-ya.c2p(yval));
             return Math.max(Math.sqrt(dx*dx + dy*dy)-rad, 1-3/rad);
@@ -42,13 +42,13 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
     Fx.getClosest(cd, distfn, pointData);
 
     // skip the rest (for this trace) if we didn't find a close point
-    if(pointData.index===false) return;
+    if(pointData.index === false) return;
 
     // the closest data point
     var di = cd[pointData.index],
         xc = xa.c2p(di.x, true),
         yc = ya.c2p(di.y, true),
-        rad = di.mrc||1;
+        rad = di.mrc || 1;
 
     pointData.color = getTraceColor(trace, di);
 

src/traces/scatter/make_bubble_size_func.js

@@ -23,7 +23,7 @@ module.exports = function makeBubbleSizeFn(trace) {
     // and by area or diameter.
     // Note this only applies to the array-value sizes
 
-    var baseFn = marker.sizemode==='area' ?
+    var baseFn = (marker.sizemode === 'area') ?
             function(v) { return Math.sqrt(v / sizeRef); } :
             function(v) { return v / sizeRef; };
 
@@ -33,7 +33,8 @@ module.exports = function makeBubbleSizeFn(trace) {
         var baseSize = baseFn(v / 2);
 
         // don't show non-numeric and negative sizes
-        return (isNumeric(baseSize) && baseSize>0) ?
-            Math.max(baseSize, sizeMin) : 0;
+        return (isNumeric(baseSize) && (baseSize > 0)) ?
+            Math.max(baseSize, sizeMin) :
+            0;
     };
 };

src/traces/scatter/marker_defaults.js

@@ -38,7 +38,7 @@ module.exports = function markerDefaults(traceIn, traceOut, defaultColor, layout
     // if there's a line with a different color than the marker, use
     // that line color as the default marker line color
     // mostly this is for transparent markers to behave nicely
-    if(lineColor && traceOut.marker.color!==lineColor) {
+    if(lineColor && (traceOut.marker.color !== lineColor)) {
         defaultMLC = lineColor;
     }
     else if(isBubble) defaultMLC = Color.background;

src/traces/scatter/plot.js

@@ -31,12 +31,13 @@ module.exports = function plot(gd, plotinfo, cdscatter) {
         .selectAll('g.trace.scatter')
         .data(cdscatter);
     scattertraces.enter().append('g')
-        .attr('class','trace scatter')
-        .style('stroke-miterlimit',2);
+        .attr('class', 'trace scatter')
+        .style('stroke-miterlimit', 2);
 
     // BUILD LINES AND FILLS
-    var prevpath='',
-        tozero,tonext,nexttonext;
+    var prevpath = '',
+        tozero, tonext, nexttonext;
+
     scattertraces.each(function(d){
         var trace = d[0].trace,
             line = trace.line,
@@ -47,7 +48,7 @@ module.exports = function plot(gd, plotinfo, cdscatter) {
 
         arraysToCalcdata(d);
 
-        if(!subTypes.hasLines(trace) && trace.fill==='none') return;
+        if(!subTypes.hasLines(trace) && trace.fill === 'none') return;
 
         var thispath,
             // fullpath is all paths for this curve, joined together straight
@@ -61,10 +62,10 @@ module.exports = function plot(gd, plotinfo, cdscatter) {
         // make the fill-to-zero path now, so it shows behind the line
         // fill to next puts the fill associated with one trace
         // grouped with the previous
-        if(trace.fill.substr(0,6)==='tozero' ||
-                (trace.fill.substr(0,2)==='to' && !prevpath)) {
+        if(trace.fill.substr(0, 6) === 'tozero' ||
+                (trace.fill.substr(0, 2) === 'to' && !prevpath)) {
             tozero = tr.append('path')
-                .classed('js-fill',true);
+                .classed('js-fill', true);
         }
         else tozero = null;
 
@@ -75,15 +76,15 @@ module.exports = function plot(gd, plotinfo, cdscatter) {
         if(nexttonext) tonext = nexttonext.datum(d);
 
         // now make a new nexttonext for next time
-        nexttonext = tr.append('path').classed('js-fill',true);
+        nexttonext = tr.append('path').classed('js-fill', true);
 
-        if(['hv','vh','hvh','vhv'].indexOf(line.shape)!==-1) {
+        if(['hv', 'vh', 'hvh', 'vhv'].indexOf(line.shape) !== -1) {
             pathfn = Drawing.steps(line.shape);
             revpathbase = Drawing.steps(
                 line.shape.split('').reverse().join('')
             );
         }
-        else if(line.shape==='spline') {
+        else if(line.shape === 'spline') {
             pathfn = revpathbase = function(pts) {
                 return Drawing.smoothopen(pts, line.smoothing);
             };
@@ -96,7 +97,7 @@ module.exports = function plot(gd, plotinfo, cdscatter) {
 
         revpathfn = function(pts) {
             // note: this is destructive (reverses pts in place) so can't use pts after this
-            return 'L'+revpathbase(pts.reverse()).substr(1);
+            return 'L' + revpathbase(pts.reverse()).substr(1);
         };
 
         var segments = linePoints(d, {
@@ -115,27 +116,27 @@ module.exports = function plot(gd, plotinfo, cdscatter) {
             for(var i = 0; i < segments.length; i++) {
                 var pts = segments[i];
                 thispath = pathfn(pts);
-                fullpath += fullpath ? ('L'+thispath.substr(1)) : thispath;
+                fullpath += fullpath ? ('L' + thispath.substr(1)) : thispath;
                 revpath = revpathfn(pts) + revpath;
                 if(subTypes.hasLines(trace) && pts.length > 1) {
-                    tr.append('path').classed('js-line',true).attr('d', thispath);
+                    tr.append('path').classed('js-line', true).attr('d', thispath);
                 }
             }
             if(tozero) {
                 if(pt0 && pt1) {
-                    if(trace.fill.charAt(trace.fill.length-1)==='y') {
-                        pt0[1]=pt1[1]=ya.c2p(0,true);
+                    if(trace.fill.charAt(trace.fill.length - 1) === 'y') {
+                        pt0[1] = pt1[1] = ya.c2p(0, true);
                     }
-                    else pt0[0]=pt1[0]=xa.c2p(0,true);
+                    else pt0[0] = pt1[0] = xa.c2p(0, true);
 
                     // fill to zero: full trace path, plus extension of
                     // the endpoints to the appropriate axis
-                    tozero.attr('d',fullpath+'L'+pt1+'L'+pt0+'Z');
+                    tozero.attr('d', fullpath + 'L' + pt1 + 'L' + pt0 + 'Z');
                 }
             }
-            else if(trace.fill.substr(0,6)==='tonext' && fullpath && prevpath) {
+            else if(trace.fill.substr(0, 6) === 'tonext' && fullpath && prevpath) {
                 // fill to next: full trace path, plus the previous path reversed
-                tonext.attr('d',fullpath+prevpath+'Z');
+                tonext.attr('d', fullpath + prevpath + 'Z');
             }
             prevpath = revpath;
         }
@@ -145,12 +146,12 @@ module.exports = function plot(gd, plotinfo, cdscatter) {
     scattertraces.selectAll('path:not([d])').remove();
 
     function visFilter(d){
-        return d.filter(function(v){ return v.vis; });
+        return d.filter(function(v) { return v.vis; });
     }
 
     scattertraces.append('g')
-        .attr('class','points')
-        .each(function(d){
+        .attr('class', 'points')
+        .each(function(d) {
             var trace = d[0].trace,
                 s = d3.select(this),
                 showMarkers = subTypes.hasMarkers(trace),
@@ -184,20 +185,20 @@ function selectMarkers(gd, plotinfo, cdscatter) {
         xr = d3.extent(xa.range.map(xa.l2c)),
         yr = d3.extent(ya.range.map(ya.l2c));
 
-    cdscatter.forEach(function(d,i) {
+    cdscatter.forEach(function(d, i) {
         var trace = d[0].trace;
         if(!subTypes.hasMarkers(trace)) return;
         // if marker.maxdisplayed is used, select a maximum of
         // mnum markers to show, from the set that are in the viewport
         var mnum = trace.marker.maxdisplayed;
 
         // TODO: remove some as we get away from the viewport?
-        if(mnum===0) return;
+        if(mnum === 0) return;
 
         var cd = d.filter(function(v) {
                 return v.x>=xr[0] && v.x<=xr[1] && v.y>=yr[0] && v.y<=yr[1];
             }),
-            inc = Math.ceil(cd.length/mnum),
+            inc = Math.ceil(cd.length / mnum),
             tnum = 0;
         cdscatter.forEach(function(cdj, j) {
             var tracei = cdj[0].trace;
@@ -211,13 +212,13 @@ function selectMarkers(gd, plotinfo, cdscatter) {
         // display this formula offsets successive traces by 1/3 of the
         // increment, adding an extra small amount after each triplet so
         // it's not quite periodic
-        var i0 = Math.round(tnum*inc/3 + Math.floor(tnum/3)*inc/7.1);
+        var i0 = Math.round(tnum*inc/3 + Math.floor(tnum/3) * inc/7.1);
 
         // for error bars: save in cd which markers to show
         // so we don't have to repeat this
-        d.forEach(function(v){ delete v.vis; });
-        cd.forEach(function(v,i) {
-            if(Math.round((i+i0)%inc)===0) v.vis = true;
+        d.forEach(function(v) { delete v.vis; });
+        cd.forEach(function(v, i) {
+            if(Math.round((i + i0) % inc) === 0) v.vis = true;
         });
     });
 }