some linting

Author: etpinard

src/plots/cartesian/dragbox.js

@@ -717,11 +717,7 @@ function makeDragBox(gd, plotinfo, x, y, w, h, ns, ew) {
         // FIXME: code duplication with cartesian.plot
         if(fullLayout._glcanvas && fullLayout._glcanvas.size()) {
             fullLayout._glcanvas.each(function(d) {
-                if(d.regl) {
-                    d.regl.clear({
-                        color: true
-                    });
-                }
+                if(d.regl) d.regl.clear({color: true});
             });
         }
 
@@ -735,8 +731,8 @@ function makeDragBox(gd, plotinfo, x, y, w, h, ns, ew) {
             // scattergl translate
             if(subplot._scene && subplot._scene.update) {
                 // FIXME: possibly we could update axis internal _r and _rl here
-                var xaRange = Lib.simpleMap(xa2.range, xa2.r2l),
-                    yaRange = Lib.simpleMap(ya2.range, ya2.r2l);
+                var xaRange = Lib.simpleMap(xa2.range, xa2.r2l);
+                var yaRange = Lib.simpleMap(ya2.range, ya2.r2l);
                 subplot._scene.update(
                     {range: [xaRange[0], yaRange[0], xaRange[1], yaRange[1]]}
                 );

src/plots/cartesian/index.js

@@ -221,10 +221,13 @@ function plotOne(gd, plotinfo, cdSubplot, transitionOpts, makeOnCompleteCallback
 }
 
 exports.clean = function(newFullData, newFullLayout, oldFullData, oldFullLayout) {
-    var oldModules = oldFullLayout._modules || [],
-        newModules = newFullLayout._modules || [];
+    var oldModules = oldFullLayout._modules || [];
+    var newModules = newFullLayout._modules || [];
+    var oldPlots = oldFullLayout._plots || {};
 
-    var hadScatter, hasScatter, hadGl, hasGl, i, oldPlots, ids, subplotInfo, moduleName;
+    var hadScatter, hasScatter;
+    var hadGl, hasGl;
+    var i, k, subplotInfo, moduleName;
 
 
     for(i = 0; i < oldModules.length; i++) {
@@ -240,12 +243,8 @@ exports.clean = function(newFullData, newFullLayout, oldFullData, oldFullLayout)
     }
 
     if(hadScatter && !hasScatter) {
-        oldPlots = oldFullLayout._plots;
-        ids = Object.keys(oldPlots || {});
-
-        for(i = 0; i < ids.length; i++) {
-            subplotInfo = oldPlots[ids[i]];
-
+        for(k in oldPlots) {
+            subplotInfo = oldPlots[k];
             if(subplotInfo.plot) {
                 subplotInfo.plot.select('g.scatterlayer')
                     .selectAll('g.trace')
@@ -260,11 +259,8 @@ exports.clean = function(newFullData, newFullLayout, oldFullData, oldFullLayout)
     }
 
     if(hadGl && !hasGl) {
-        oldPlots = oldFullLayout._plots;
-        ids = Object.keys(oldPlots || {});
-
-        for(i = 0; i < ids.length; i++) {
-            subplotInfo = oldPlots[ids[i]];
+        for(k in oldPlots) {
+            subplotInfo = oldPlots[k];
 
             if(subplotInfo._scene) {
                 subplotInfo._scene.destroy();