enforce space-before-blocks,

- so that: if() { / for() { and function() {
  not: if(){ / for(){ and function(){

  are the norm

.eslintrc

@@ -30,6 +30,7 @@
     "no-spaced-func": [2],
     "space-in-parens": [2, "never"],
     "space-before-function-paren": [2, "never"],
+    "space-before-blocks": [2],
     "no-multi-spaces": [2],
     "space-infix-ops": [0, {"int32Hint": false}],
     "quotes": [2, "single"],

src/components/annotations/index.js

@@ -363,7 +363,7 @@ annotations.draw = function(gd, index, opt, value) {
         .attr('data-unformatted', options.text)
         .text(options.text);
 
-    function textLayout(s){
+    function textLayout(s) {
         s.call(Plotly.Drawing.font, font)
         .attr({
             'text-anchor': {
@@ -375,7 +375,7 @@ annotations.draw = function(gd, index, opt, value) {
         return s;
     }
 
-    function drawGraphicalElements(){
+    function drawGraphicalElements() {
 
         // make sure lines are aligned the way they will be
         // at the end, even if their position changes
@@ -395,8 +395,8 @@ annotations.draw = function(gd, index, opt, value) {
         options._w = annwidth;
         options._h = annheight;
 
-        function shiftFraction(v, anchor){
-            if(anchor==='auto'){
+        function shiftFraction(v, anchor) {
+            if(anchor==='auto') {
                 if(v < 1/3) anchor = 'left';
                 else if(v > 2/3) anchor = 'right';
                 else anchor = 'center';
@@ -469,7 +469,7 @@ annotations.draw = function(gd, index, opt, value) {
 
         // make sure the arrowhead (if there is one)
         // and the annotation center are visible
-        if(options.showarrow){
+        if(options.showarrow) {
             arrowX = Plotly.Lib.constrain(annPosPx.x - options.ax, 1, fullLayout.width - 1);
             arrowY = Plotly.Lib.constrain(annPosPx.y - options.ay, 1, fullLayout.height - 1);
         }
@@ -498,7 +498,7 @@ annotations.draw = function(gd, index, opt, value) {
 
         // add the arrow
         // uses options[arrowwidth,arrowcolor,arrowhead] for styling
-        var drawArrow = function(dx, dy){
+        var drawArrow = function(dx, dy) {
             d3.select(gd)
                 .selectAll('.annotation-arrow-g[data-index="' + index + '"]')
                 .remove();
@@ -541,7 +541,7 @@ annotations.draw = function(gd, index, opt, value) {
                 return;
             }
 
-            edges.forEach(function(x){
+            edges.forEach(function(x) {
                 var p = lineIntersect(arrowX0, arrowY0, arrowX, arrowY,
                             x[0], x[1], x[2], x[3]);
                 if(p) {
@@ -711,7 +711,7 @@ annotations.draw = function(gd, index, opt, value) {
     if(gd._context.editable) {
         anntext.call(Plotly.util.makeEditable, ann)
             .call(textLayout)
-            .on('edit', function(_text){
+            .on('edit', function(_text) {
                 options.text = _text;
                 this.attr({'data-unformatted': options.text});
                 this.call(textLayout);
@@ -839,7 +839,7 @@ annotations.calcAutorange = function(gd) {
     if(!annotationList.length || !gd._fullData.length) return;
 
     var annotationAxes = {};
-    annotationList.forEach(function(ann){
+    annotationList.forEach(function(ann) {
         annotationAxes[ann.xref] = true;
         annotationAxes[ann.yref] = true;
     });
@@ -863,7 +863,7 @@ function annAutorange(gd) {
     // relative to their anchor points
     // use the arrow and the text bg rectangle,
     // as the whole anno may include hidden text in its bbox
-    fullLayout.annotations.forEach(function(ann){
+    fullLayout.annotations.forEach(function(ann) {
         var xa = Plotly.Axes.getFromId(gd, ann.xref),
             ya = Plotly.Axes.getFromId(gd, ann.yref);
         if(!(xa || ya)) return;

src/components/color/index.js

@@ -39,7 +39,7 @@ color.addOpacity = function(cstr, op) {
 // combine two colors into one apparent color
 // if back has transparency or is missing,
 // color.background is assumed behind it
-color.combine = function(front, back){
+color.combine = function(front, back) {
     var fc = tinycolor(front).toRgb();
     if(fc.a===1) return tinycolor(front).toRgbString();
 

src/components/colorbar/draw.js

@@ -50,7 +50,7 @@ module.exports = function draw(gd, id) {
     // evaluated halfway between levels
     opts.filllevels = null;
 
-    function component(){
+    function component() {
         var fullLayout = gd._fullLayout;
         if((typeof opts.fillcolor !== 'function') &&
                 (typeof opts.line.color !== 'function')) {
@@ -63,9 +63,9 @@ module.exports = function draw(gd, id) {
             filllevels = [],
             l,
             linecolormap = typeof opts.line.color === 'function' ?
-                opts.line.color : function(){ return opts.line.color; },
+                opts.line.color : function() { return opts.line.color; },
             fillcolormap = typeof opts.fillcolor === 'function' ?
-                opts.fillcolor : function(){ return opts.fillcolor; };
+                opts.fillcolor : function() { return opts.fillcolor; };
 
         var l0 = opts.levels.end + opts.levels.size/100,
             ls = opts.levels.size,
@@ -84,7 +84,7 @@ module.exports = function draw(gd, id) {
                 }
             }
             else {
-                filllevels = linelevels.map(function(v){
+                filllevels = linelevels.map(function(v) {
                     return v-opts.levels.size / 2;
                 });
                 filllevels.push(filllevels[filllevels.length - 1] +
@@ -233,7 +233,7 @@ module.exports = function draw(gd, id) {
         // now draw the elements
         var container = fullLayout._infolayer.selectAll('g.'+id).data([0]);
         container.enter().append('g').classed(id,true)
-            .each(function(){
+            .each(function() {
                 var s = d3.select(this);
                 s.append('rect').classed('cbbg',true);
                 s.append('g').classed('cbfills',true);
@@ -260,7 +260,7 @@ module.exports = function draw(gd, id) {
             Titles.draw(gd, cbAxisOut._id + 'title');
         }
 
-        function drawAxis(){
+        function drawAxis() {
             if(['top','bottom'].indexOf(opts.titleside)!==-1) {
                 // squish the axis top to make room for the title
                 var titleGroup = container.select('.cbtitle'),
@@ -373,7 +373,7 @@ module.exports = function draw(gd, id) {
             return Axes.doTicks(gd, cbAxisOut);
         }
 
-        function positionCB(){
+        function positionCB() {
             // wait for the axis & title to finish rendering before
             // continuing positioning
             // TODO: why are we redrawing multiple times now with this?

src/components/drawing/index.js

@@ -41,8 +41,8 @@ drawing.setRect = function(s, x, y, w, h) {
     s.call(drawing.setPosition, x, y).call(drawing.setSize, w, h);
 };
 
-drawing.translatePoints = function(s, xa, ya){
-    s.each(function(d){
+drawing.translatePoints = function(s, xa, ya) {
+    s.each(function(d) {
         // put xp and yp into d if pixel scaling is already done
         var x = d.xp || xa.c2p(d.x),
             y = d.yp || ya.c2p(d.y),
@@ -77,7 +77,7 @@ drawing.crispRound = function(td, lineWidth, dflt) {
 
 drawing.lineGroupStyle = function(s, lw, lc, ld) {
     s.style('fill','none')
-    .each(function(d){
+    .each(function(d) {
         var line = (((d||[])[0]||{}).trace||{}).line||{},
             lw1 = lw||line.width||0,
             dash = ld||line.dash||'';
@@ -111,7 +111,7 @@ drawing.dashLine = function(s, dash, lineWidth) {
 
 drawing.fillGroupStyle = function(s) {
     s.style('stroke-width',0)
-    .each(function(d){
+    .each(function(d) {
         var shape = d3.select(this);
         try {
             shape.call(Plotly.Color.fill, d[0].trace.fillcolor);
@@ -203,7 +203,7 @@ drawing.pointStyle = function(s, trace) {
             return drawing.symbolFuncs[xBase](r) +
                 (x >= 200 ? DOTPATH : '');
         })
-        .style('opacity',function(d){
+        .style('opacity',function(d) {
             return (d.mo+1 || marker.opacity+1) - 1;
         });
     }
@@ -213,7 +213,7 @@ drawing.pointStyle = function(s, trace) {
         markerScale = drawing.tryColorscale(marker, markerIn, ''),
         lineScale = drawing.tryColorscale(marker, markerIn, 'line.');
 
-    s.each(function(d){
+    s.each(function(d) {
         // 'so' is suspected outliers, for box plots
         var fillColor,
             lineColor,
@@ -299,7 +299,7 @@ drawing.tryColorscale = function(cont, contIn, prefix) {
 var TEXTOFFSETSIGN = {start: 1, end: -1, middle: 0, bottom: 1, top: -1},
     LINEEXPAND = 1.3;
 drawing.textPointStyle = function(s, trace) {
-    s.each(function(d){
+    s.each(function(d) {
         var p = d3.select(this),
             text = d.tx || trace.text;
         if(!text || Array.isArray(text)) {

src/components/errorbars/index.js

@@ -70,7 +70,7 @@ errorBars.plot = function(gd, plotinfo, cd) {
         .data(cd)
       .enter().append('g')
         .attr('class','errorbars')
-        .each(function(d){
+        .each(function(d) {
             var trace = d[0].trace,
                 xObj = trace.error_x,
                 yObj = trace.error_y,
@@ -82,15 +82,15 @@ errorBars.plot = function(gd, plotinfo, cd) {
             d3.select(this).selectAll('g')
                 .data(Lib.identity)
               .enter().append('g')
-                .each(function(d){
+                .each(function(d) {
                     coords = errorcoords(d, xa, ya);
                     var eb = d3.select(this),
                         path;
                     if(sparse && !d.vis) return;
 
                     if(yObj.visible && isNumeric(coords.x) &&
                             isNumeric(coords.yh) &&
-                            isNumeric(coords.ys)){
+                            isNumeric(coords.ys)) {
                         var yw = yObj.width;
                         path = 'M'+(coords.x-yw)+','+coords.yh+'h'+(2*yw) + // hat
                             'm-'+yw+',0V'+coords.ys; // bar
@@ -102,7 +102,7 @@ errorBars.plot = function(gd, plotinfo, cd) {
                     }
                     if(xObj.visible && isNumeric(coords.y) &&
                             isNumeric(coords.xh) &&
-                            isNumeric(coords.xs)){
+                            isNumeric(coords.xs)) {
                         var xw = (xObj.copy_ystyle ? yObj : xObj).width;
                         path = 'M'+coords.xh+','+(coords.y-xw)+'v'+(2*xw) + // hat
                             'm0,-'+xw+'H'+coords.xs; // bar
@@ -116,8 +116,8 @@ errorBars.plot = function(gd, plotinfo, cd) {
         });
 };
 
-errorBars.style = function(gd){
-    d3.select(gd).selectAll('g.errorbars').each(function(d){
+errorBars.style = function(gd) {
+    d3.select(gd).selectAll('g.errorbars').each(function(d) {
         var eb = d3.select(this),
             trace = d[0].trace,
             yObj = trace.error_y||{},