apply new eslint rule - pass2 - manual

Author: archmoj

src/components/color/index.js

@@ -106,19 +106,21 @@ color.clean = function(container) {
         key = keys[i];
         val = container[key];
 
-        // only sanitize keys that end in "color" or "colorscale"
         if(key.substr(key.length - 5) === 'color') {
+            // only sanitize keys that end in "color" or "colorscale"
+
             if(Array.isArray(val)) {
                 for(j = 0; j < val.length; j++) val[j] = cleanOne(val[j]);
             } else container[key] = cleanOne(val);
         } else if(key.substr(key.length - 10) === 'colorscale' && Array.isArray(val)) {
             // colorscales have the format [[0, color1], [frac, color2], ... [1, colorN]]
+
             for(j = 0; j < val.length; j++) {
                 if(Array.isArray(val[j])) val[j][1] = cleanOne(val[j][1]);
             }
-        }
-        // recurse into arrays of objects, and plain objects
-        else if(Array.isArray(val)) {
+        } else if(Array.isArray(val)) {
+            // recurse into arrays of objects, and plain objects
+
             var el0 = val[0];
             if(!Array.isArray(el0) && el0 && typeof el0 === 'object') {
                 for(j = 0; j < val.length; j++) color.clean(val[j]);
@@ -144,14 +146,21 @@ function cleanOne(val) {
         if(!parts[i].length) return val;
         parts[i] = Number(parts[i]);
 
-        // all parts must be non-negative numbers
-        if(!(parts[i] >= 0)) return val;
-        // alpha>1 gets clipped to 1
+        if(!(parts[i] >= 0)) {
+            // all parts must be non-negative numbers
+
+            return val;
+        }
+
         if(i === 3) {
+            // alpha>1 gets clipped to 1
+
             if(parts[i] > 1) parts[i] = 1;
+        } else if(parts[i] >= 1) {
+            // r, g, b must be < 1 (ie 1 itself is not allowed)
+
+            return val;
         }
-        // r, g, b must be < 1 (ie 1 itself is not allowed)
-        else if(parts[i] >= 1) return val;
     }
 
     var rgbStr = Math.round(parts[0] * 255) + ', ' +

src/components/modebar/manage.js

@@ -203,11 +203,13 @@ function isSelectable(fullData) {
             if(trace.boxpoints === 'all' || trace.points === 'all') {
                 selectable = true;
             }
+        } else {
+            // assume that in general if the trace module has selectPoints,
+            // then it's selectable. Scatter is an exception to this because it must
+            // have markers or text, not just be a scatter type.
+
+            selectable = true;
         }
-        // assume that in general if the trace module has selectPoints,
-        // then it's selectable. Scatter is an exception to this because it must
-        // have markers or text, not just be a scatter type.
-        else selectable = true;
     }
 
     return selectable;

src/lib/extend.js

@@ -84,13 +84,13 @@ function _extend(inputs, isDeep, keepAllKeys, noArrayCopies) {
             src = target[key];
             copy = input[key];
 
-            // Stop early and just transfer the array if array copies are disallowed:
             if(noArrayCopies && isArray(copy)) {
+                // Stop early and just transfer the array if array copies are disallowed:
+
                 target[key] = copy;
-            }
+            } else if(isDeep && copy && (isPlainObject(copy) || (copyIsArray = isArray(copy)))) {
+                // recurse if we're merging plain objects or arrays
 
-            // recurse if we're merging plain objects or arrays
-            else if(isDeep && copy && (isPlainObject(copy) || (copyIsArray = isArray(copy)))) {
                 if(copyIsArray) {
                     copyIsArray = false;
                     clone = src && isArray(src) ? src : [];
@@ -100,10 +100,9 @@ function _extend(inputs, isDeep, keepAllKeys, noArrayCopies) {
 
                 // never move original objects, clone them
                 target[key] = _extend([clone, copy], isDeep, keepAllKeys, noArrayCopies);
-            }
+            } else if(typeof copy !== 'undefined' || keepAllKeys) {
+                // don't bring in undefined values, except for extendDeepAll
 
-            // don't bring in undefined values, except for extendDeepAll
-            else if(typeof copy !== 'undefined' || keepAllKeys) {
                 target[key] = copy;
             }
         }

src/lib/polygon.js

@@ -113,9 +113,10 @@ polygon.tester = function tester(ptsIn) {
             y1 = pts[i][1];
             xmini = Math.min(x0, x1);
 
-            // outside the bounding box of this segment, it's only a crossing
-            // if it's below the box.
             if(x < xmini || x > Math.max(x0, x1) || y > Math.max(y0, y1)) {
+                // outside the bounding box of this segment, it's only a crossing
+                // if it's below the box.
+
                 continue;
             } else if(y < Math.min(y0, y1)) {
                 // don't count the left-most point of the segment as a crossing
@@ -124,9 +125,9 @@ polygon.tester = function tester(ptsIn) {
                 // Note that this is repeated below, but we can't factor it out
                 // because
                 if(x !== xmini) crossings++;
-            }
-            // inside the bounding box, check the actual line intercept
-            else {
+            } else {
+                // inside the bounding box, check the actual line intercept
+
                 // vertical segment - we know already that the point is exactly
                 // on the segment, so mark the crossing as exactly at the point.
                 if(x1 === x0) ycross = y;

src/plot_api/helpers.js

@@ -62,8 +62,9 @@ exports.cleanLayout = function(layout) {
     for(i = 0; i < keys.length; i++) {
         var key = keys[i];
 
-        // modifications to cartesian axes
         if(axisAttrRegex && axisAttrRegex.test(key)) {
+            // modifications to cartesian axes
+
             var ax = layout[key];
             if(ax.anchor && ax.anchor !== 'free') {
                 ax.anchor = cleanId(ax.anchor);
@@ -96,26 +97,21 @@ exports.cleanLayout = function(layout) {
             }
 
             cleanTitle(ax);
-        }
+        } else if(polarAttrRegex && polarAttrRegex.test(key)) {
+            // modifications for polar
 
-        // modifications for polar
-        else if(polarAttrRegex && polarAttrRegex.test(key)) {
             var polar = layout[key];
-
             cleanTitle(polar.radialaxis);
-        }
+        } else if(ternaryAttrRegex && ternaryAttrRegex.test(key)) {
+            // modifications for ternary
 
-        // modifications for ternary
-        else if(ternaryAttrRegex && ternaryAttrRegex.test(key)) {
             var ternary = layout[key];
-
             cleanTitle(ternary.aaxis);
             cleanTitle(ternary.baxis);
             cleanTitle(ternary.caxis);
-        }
+        } else if(sceneAttrRegex && sceneAttrRegex.test(key)) {
+            // modifications for 3D scenes
 
-        // modifications for 3D scenes
-        else if(sceneAttrRegex && sceneAttrRegex.test(key)) {
             var scene = layout[key];
 
             // clean old Camera coords
@@ -602,25 +598,26 @@ exports.manageArrayContainers = function(np, newVal, undoit) {
 
     var pLastIsNumber = isNumeric(pLast);
 
-    // delete item
     if(pLastIsNumber && newVal === null) {
+        // delete item
+
         // Clear item in array container when new value is null
         var contPath = parts.slice(0, pLength - 1).join('.');
         var cont = Lib.nestedProperty(obj, contPath).get();
         cont.splice(pLast, 1);
 
         // Note that nested property clears null / undefined at end of
         // array container, but not within them.
-    }
-    // create item
-    else if(pLastIsNumber && np.get() === undefined) {
+    } else if(pLastIsNumber && np.get() === undefined) {
+        // create item
+
         // When adding a new item, make sure undo command will remove it
         if(np.get() === undefined) undoit[np.astr] = null;
 
         np.set(newVal);
-    }
-    // update item
-    else {
+    } else {
+        // update item
+
         // If the last part of attribute string isn't a number,
         // np.set is all we need.
         np.set(newVal);

src/plot_api/plot_api.js

@@ -1625,18 +1625,17 @@ function _restyle(gd, aobj, traces) {
                 for(var impliedKey in valObject.impliedEdits) {
                     doextra(Lib.relativeAttr(ai, impliedKey), valObject.impliedEdits[impliedKey], i);
                 }
-            }
-
-            // changing colorbar size modes,
-            // make the resulting size not change
-            // note that colorbar fractional sizing is based on the
-            // original plot size, before anything (like a colorbar)
-            // increases the margins
-            else if((finalPart === 'thicknessmode' || finalPart === 'lenmode') &&
+            } else if((finalPart === 'thicknessmode' || finalPart === 'lenmode') &&
                     oldVal !== newVal &&
                     (newVal === 'fraction' || newVal === 'pixels') &&
                     innerContFull
             ) {
+                // changing colorbar size modes,
+                // make the resulting size not change
+                // note that colorbar fractional sizing is based on the
+                // original plot size, before anything (like a colorbar)
+                // increases the margins
+
                 var gs = fullLayout._size;
                 var orient = innerContFull.orient;
                 var topOrBottom = (orient === 'top') || (orient === 'bottom');
@@ -1690,10 +1689,10 @@ function _restyle(gd, aobj, traces) {
                     if((param.get() || defaultOrientation) === contFull.orientation) {
                         continue;
                     }
-                }
-                // orientationaxes has no value,
-                // it flips everything and the axes
-                else if(ai === 'orientationaxes') {
+                } else if(ai === 'orientationaxes') {
+                    // orientationaxes has no value,
+                    // it flips everything and the axes
+
                     cont.orientation =
                         {v: 'h', h: 'v'}[contFull.orientation];
                 }
@@ -2113,9 +2112,9 @@ function _relayout(gd, aobj) {
             // depends on vi here too, so again can't use impliedEdits
             doextra('width', vi ? null : fullLayout.width);
             doextra('height', vi ? null : fullLayout.height);
-        }
-        // check autorange vs range
-        else if(pleafPlus.match(AX_RANGE_RE)) {
+        } else if(pleafPlus.match(AX_RANGE_RE)) {
+            // check autorange vs range
+
             recordAlteredAxis(pleafPlus);
             nestedProperty(fullLayout, ptrunk + '._inputRange').set(null);
         } else if(pleafPlus.match(AX_AUTORANGE_RE)) {
@@ -2240,9 +2239,9 @@ function _relayout(gd, aobj) {
             objEdits[propStr] = vi;
 
             delete aobj[ai];
-        }
-        // handle axis reversal explicitly, as there's no 'reverse' attribute
-        else if(pleaf === 'reverse') {
+        } else if(pleaf === 'reverse') {
+            // handle axis reversal explicitly, as there's no 'reverse' attribute
+
             if(parentIn.range) parentIn.range.reverse();
             else {
                 doextra(ptrunk + '.autorange', true);

src/plot_api/plot_schema.js

@@ -543,6 +543,7 @@ function getLayoutAttributes() {
         _module = Registry.componentsRegistry[key];
         var schema = _module.schema;
 
+        if(schema && (schema.subplots || schema.layout)) {
         /*
          * Components with defined schema have already been merged in at register time
          * but a few components define attributes that apply only to xaxis
@@ -553,14 +554,14 @@ function getLayoutAttributes() {
          * we will need to extend both this code and mergeComponentAttrsToSubplot
          * (which will not find yaxis only for example)
          */
-        if(schema && (schema.subplots || schema.layout)) {
+
             var subplots = schema.subplots;
             if(subplots && subplots.xaxis && !subplots.yaxis) {
                 for(var xkey in subplots.xaxis) delete layoutAttributes.yaxis[xkey];
             }
-        }
+        } else if(_module.layoutAttributes) {
         // older style without schema need to be explicitly merged in now
-        else if(_module.layoutAttributes) {
+
             insertAttrs(layoutAttributes, _module.layoutAttributes, _module.name);
         }
     }

src/plots/cartesian/axes.js

@@ -233,25 +233,26 @@ axes.minDtick = function(ax, newDiff, newFirst, allow) {
     // and the plot itself may decide to cancel (ie non-grouped bars)
     if(['log', 'category', 'multicategory'].indexOf(ax.type) !== -1 || !allow) {
         ax._minDtick = 0;
-    }
-    // undefined means there's nothing there yet
-    else if(ax._minDtick === undefined) {
+    } else if(ax._minDtick === undefined) {
+        // undefined means there's nothing there yet
+
         ax._minDtick = newDiff;
         ax._forceTick0 = newFirst;
     } else if(ax._minDtick) {
-        // existing minDtick is an integer multiple of newDiff
-        // (within rounding err)
-        // and forceTick0 can be shifted to newFirst
         if((ax._minDtick / newDiff + 1e-6) % 1 < 2e-6 &&
+            // existing minDtick is an integer multiple of newDiff
+            // (within rounding err)
+            // and forceTick0 can be shifted to newFirst
+
                 (((newFirst - ax._forceTick0) / newDiff % 1) +
                     1.000001) % 1 < 2e-6) {
             ax._minDtick = newDiff;
             ax._forceTick0 = newFirst;
-        }
-        // if the converse is true (newDiff is a multiple of minDtick and
-        // newFirst can be shifted to forceTick0) then do nothing - same
-        // forcing stands. Otherwise, cancel forced minimum
-        else if((newDiff / ax._minDtick + 1e-6) % 1 > 2e-6 ||
+        } else if((newDiff / ax._minDtick + 1e-6) % 1 > 2e-6 ||
+            // if the converse is true (newDiff is a multiple of minDtick and
+            // newFirst can be shifted to forceTick0) then do nothing - same
+            // forcing stands. Otherwise, cancel forced minimum
+
                 (((newFirst - ax._forceTick0) / ax._minDtick % 1) +
                     1.000001) % 1 > 2e-6) {
             ax._minDtick = 0;
@@ -431,17 +432,18 @@ function autoShiftNumericBins(binStart, data, ax, dataMin, dataMax) {
     var dataCount = data.length - blankCount;
 
     if(intcount === dataCount && ax.type !== 'date') {
-        // all integers: if bin size is <1, it's because
-        // that was specifically requested (large nbins)
-        // so respect that... but center the bins containing
-        // integers on those integers
         if(ax.dtick < 1) {
+            // all integers: if bin size is <1, it's because
+            // that was specifically requested (large nbins)
+            // so respect that... but center the bins containing
+            // integers on those integers
+
             binStart = dataMin - 0.5 * ax.dtick;
-        }
-        // otherwise start half an integer down regardless of
-        // the bin size, just enough to clear up endpoint
-        // ambiguity about which integers are in which bins.
-        else {
+        } else {
+            // otherwise start half an integer down regardless of
+            // the bin size, just enough to clear up endpoint
+            // ambiguity about which integers are in which bins.
+
             binStart -= 0.5;
             if(binStart + ax.dtick < dataMin) binStart += ax.dtick;
         }
@@ -829,9 +831,10 @@ function autoTickRound(ax) {
                 ax._tickexponent = 3 * Math.round((rangeexp - 1) / 3);
             } else ax._tickexponent = rangeexp;
         }
+    } else {
+        // D1 or D2 (log)
+        ax._tickround = null;
     }
-    // D1 or D2 (log)
-    else ax._tickround = null;
 }
 
 // months and years don't have constant millisecond values
@@ -915,10 +918,9 @@ axes.tickFirst = function(ax) {
         }
         Lib.error('tickFirst did not converge', ax);
         return t0;
-    }
+    } else if(tType === 'L') {
+        // Log scales: Linear, Digits
 
-    // Log scales: Linear, Digits
-    else if(tType === 'L') {
         return Math.log(sRound(
             (Math.pow(10, r0) - tick0) / dtNum) * dtNum + tick0) / Math.LN10;
     } else if(tType === 'D') {