enfore keyword-spacing rule,

- so that if() and for() are the norm.

Author: etpinard

.eslintrc

@@ -20,6 +20,13 @@
     "semi": [2],
     "semi-spacing": [2, {"before": false, "after": true}],
     "key-spacing": [2, {"beforeColon": false, "afterColon": true}],
+    "keyword-spacing": [2, {"overrides": {
+      "if": {"after": false},
+      "for": {"after": false},
+      "while": {"after": false},
+      "switch": {"after": false},
+      "catch": {"after": false}
+    }}],
     "no-spaced-func": [2],
     "space-in-parens": [2, "never"],
     "space-before-function-paren": [2, "never"],

devtools/test_dashboard/buttons.js

@@ -65,12 +65,12 @@ function plotButtons(plots, figDir) {
         /*
          * Grab the currently loaded plot and make an image - replacing the plot.
          */
-        if (!gd) return;
+        if(!gd) return;
 
         var layout = gd.layout;
         var data = gd.data;
 
-        if (!layout || !data) return;
+        if(!layout || !data) return;
 
         Plotly.Plots.getSubplotIds(gd._fullLayout, 'gl3d').forEach(function(key) {
             var scene = gd._fullLayout[key]._scene;

src/components/annotations/index.js

@@ -186,7 +186,7 @@ annotations.draw = function(gd, index, opt, value) {
                     Plotly.Lib.extendFlat({}, value) :
                     {text: 'New text'};
 
-            if (layout.annotations) {
+            if(layout.annotations) {
                 layout.annotations.splice(index, 0, rule);
             } else {
                 layout.annotations = [rule];

src/components/colorscale/is_valid_scale_array.js

@@ -20,7 +20,7 @@ module.exports = function isValidScaleArray(scl) {
     if(!Array.isArray(scl)) return false;
     else {
         if(+scl[0][0]!==0 || +scl[scl.length-1][0]!==1) return false;
-        for (var i = 0; i < scl.length; i++) {
+        for(var i = 0; i < scl.length; i++) {
             si = scl[i];
             if(si.length!==2 || +si[0]<highestVal || !tinycolor(si[1]).isValid()) {
                 isValid = false;

src/components/modebar/buttons.js

@@ -50,13 +50,13 @@ modeBarButtons.toImage = {
     click: function(gd) {
         var format = 'png';
 
-        if (Lib.isIE()) {
+        if(Lib.isIE()) {
             Lib.notifier('Snapshotting is unavailable in Internet Explorer. ' +
                          'Consider exporting your images using the Plotly Cloud', 'long');
             return;
         }
 
-        if (gd._snapshotInProgress) {
+        if(gd._snapshotInProgress) {
             Lib.notifier('Snapshotting is still in progress - please hold', 'long');
             return;
         }
@@ -242,7 +242,7 @@ function handleCartesian(gd, ev) {
     }
     else {
         // if ALL traces have orientation 'h', 'hovermode': 'x' otherwise: 'y'
-        if (astr==='hovermode' && (val==='x' || val==='y')) {
+        if(astr==='hovermode' && (val==='x' || val==='y')) {
             val = fullLayout._isHoriz ? 'y' : 'x';
             button.setAttribute('data-val', val);
         }

src/components/modebar/index.js

@@ -225,12 +225,12 @@ proto.hasButtons = function(buttons) {
 
     if(!currentButtons) return false;
 
-    if (buttons.length !== currentButtons.length) return false;
+    if(buttons.length !== currentButtons.length) return false;
 
-    for (var i = 0; i < buttons.length; ++i) {
-        if (buttons[i].length !== currentButtons[i].length) return false;
-        for (var j = 0; j < buttons[i].length; j++) {
-            if (buttons[i][j].name !== currentButtons[i][j].name) return false;
+    for(var i = 0; i < buttons.length; ++i) {
+        if(buttons[i].length !== currentButtons[i].length) return false;
+        for(var j = 0; j < buttons[i].length; j++) {
+            if(buttons[i][j].name !== currentButtons[i][j].name) return false;
         }
     }
 

src/components/shapes/index.js

@@ -175,7 +175,7 @@ shapes.draw = function(gd, index, opt, value) {
                     Plotly.Lib.extendFlat({}, value) :
                     {text: 'New text'};
 
-            if (layout.shapes) {
+            if(layout.shapes) {
                 layout.shapes.splice(index, 0, rule);
             } else {
                 layout.shapes = [rule];

src/fonts/mathjax_config.js

@@ -13,7 +13,7 @@
 /**
  * Check and configure MathJax
  */
-if (typeof MathJax !== 'undefined'){
+if(typeof MathJax !== 'undefined'){
     exports.MathJax = true;
 
     MathJax.Hub.Config({

src/lib/dates.js

@@ -46,7 +46,7 @@ var isNumeric = require('fast-isnumeric');
 exports.dateTime2ms = function(s) {
     // first check if s is a date object
     try {
-        if (s.getTime) return +s;
+        if(s.getTime) return +s;
     }
     catch(e) {
         return false;
@@ -55,51 +55,51 @@ exports.dateTime2ms = function(s) {
     var y, m, d, h;
     // split date and time parts
     var datetime = String(s).split(' ');
-    if (datetime.length > 2) return false;
+    if(datetime.length > 2) return false;
 
     var p = datetime[0].split('-'); // date part
-    if (p.length > 3 || (p.length !== 3 && datetime[1])) return false;
+    if(p.length > 3 || (p.length !== 3 && datetime[1])) return false;
 
     // year
-    if (p[0].length === 4) y = Number(p[0]);
-    else if (p[0].length === 2) {
+    if(p[0].length === 4) y = Number(p[0]);
+    else if(p[0].length === 2) {
         var yNow = new Date().getFullYear();
         y = ((Number(p[0]) - yNow + 70)%100 + 200)%100 + yNow - 70;
     }
     else return false;
-    if (!isNumeric(y)) return false;
-    if (p.length === 1) return new Date(y,0,1).getTime(); // year only
+    if(!isNumeric(y)) return false;
+    if(p.length === 1) return new Date(y,0,1).getTime(); // year only
 
     // month
     m = Number(p[1]) - 1; // new Date() uses zero-based months
-    if (p[1].length > 2 || !(m >= 0 && m <= 11)) return false;
-    if (p.length === 2) return new Date(y, m, 1).getTime(); // year-month
+    if(p[1].length > 2 || !(m >= 0 && m <= 11)) return false;
+    if(p.length === 2) return new Date(y, m, 1).getTime(); // year-month
 
     // day
     d = Number(p[2]);
-    if (p[2].length > 2 || !(d >= 1 && d <= 31)) return false;
+    if(p[2].length > 2 || !(d >= 1 && d <= 31)) return false;
 
     // now save the date part
     d = new Date(y, m, d).getTime();
-    if (!datetime[1]) return d; // year-month-day
+    if(!datetime[1]) return d; // year-month-day
     p = datetime[1].split(':');
-    if (p.length > 3) return false;
+    if(p.length > 3) return false;
 
     // hour
     h = Number(p[0]);
-    if (p[0].length > 2 || !(h >= 0 && h <= 23)) return false;
+    if(p[0].length > 2 || !(h >= 0 && h <= 23)) return false;
     d += 3600000*h;
-    if (p.length === 1) return d;
+    if(p.length === 1) return d;
 
     // minute
     m = Number(p[1]);
-    if (p[1].length > 2 || !(m >= 0 && m <= 59)) return false;
+    if(p[1].length > 2 || !(m >= 0 && m <= 59)) return false;
     d += 60000*m;
-    if (p.length === 2) return d;
+    if(p.length === 2) return d;
 
     // second
     s = Number(p[2]);
-    if (!(s >= 0 && s < 60)) return false;
+    if(!(s >= 0 && s < 60)) return false;
     return d+s*1000;
 };
 
@@ -270,13 +270,13 @@ function getTimeType(v) {
 
 exports.parseDate = function(v) {
     // is it already a date? just return it
-    if (v.getTime) return v;
+    if(v.getTime) return v;
     /**
      * otherwise, if it's not a string, return nothing
      * the case of numbers that just have years will get
      * dealt with elsewhere.
      */
-    if (typeof v !== 'string') return false;
+    if(typeof v !== 'string') return false;
 
     // first clean up the string a bit to reduce the number of formats we have to test
     v = v.toLowerCase()
@@ -320,13 +320,13 @@ exports.parseDate = function(v) {
     formatList = dateTimeFormats[dateType][timeType];
     len = formatList.length;
 
-    for (var i = 0; i < len; i++) {
+    for(var i = 0; i < len; i++) {
         out = formatList[i].parse(v);
-        if (out) break;
+        if(out) break;
     }
 
     // If not an instance of Date at this point, just return it.
-    if (!(out instanceof Date)) return false;
+    if(!(out instanceof Date)) return false;
     // parse() method interprets arguments with local time zone.
     var tzoff = out.getTimezoneOffset();
     // In general (default) this is not what we want, so force into UTC:

src/lib/events.js

@@ -21,7 +21,7 @@ var Events = {
          * If we have already instantiated an emitter for this plot
          * return early.
          */
-        if (plotObj._ev instanceof EventEmitter) return plotObj;
+        if(plotObj._ev instanceof EventEmitter) return plotObj;
 
         var ev = new EventEmitter();
 
@@ -53,7 +53,7 @@ var Events = {
          * events.
          */
         plotObj.emit = function(event, data) {
-            if (typeof $ !== 'undefined') {
+            if(typeof $ !== 'undefined') {
                 $(plotObj).trigger(event, data);
             }
 
@@ -76,29 +76,29 @@ var Events = {
          * If Jquery exists run all its handlers for this event and
          * collect the return value of the LAST handler function
          */
-        if (typeof $ !== 'undefined') {
+        if(typeof $ !== 'undefined') {
             jQueryHandlerValue = $(plotObj).triggerHandler(event, data);
         }
 
         /*
          * Now run all the node style event handlers
          */
         var ev = plotObj._ev;
-        if (!ev) return jQueryHandlerValue;
+        if(!ev) return jQueryHandlerValue;
 
         var handlers = ev._events[event];
-        if (!handlers) return jQueryHandlerValue;
+        if(!handlers) return jQueryHandlerValue;
 
         /*
          * handlers can be function or an array of functions
          */
-        if (typeof handlers === 'function') handlers = [handlers];
+        if(typeof handlers === 'function') handlers = [handlers];
         var lastHandler = handlers.pop();
 
         /*
          * Call all the handlers except the last one.
          */
-        for (var i = 0; i < handlers.length; i++) {
+        for(var i = 0; i < handlers.length; i++) {
             handlers[i](data);
         }