lint: gl-vis --> plotly.js

etpinard · etpinard · commit 911796cea0fc · 2015-12-03T18:36:09.000-05:00
diff --git a/src/traces/scatter3d/calc_errors.js b/src/traces/scatter3d/calc_errors.js
@@ -10,37 +10,31 @@
 'use strict';
 
 function calculateAxisErrors(data, params) {
-    if(!params || !params.visible) {
-        return null;
-    }
+    if(!params || !params.visible) return null;
 
     function option(name, value) {
-        if(name in params) {
-            return params[name];
-        }
+        if(name in params) return params[name];
         return value;
     }
 
-    var result      = new Array(data.length);
-    var type        = option('type', 'percent');
-    var symmetric   = option('symmetric', true);
-    var value       = +option('value', 10);
-    var minusValue  = +option('valueminus', 10);
-    var error       = option('array', null);
-    var minusError  = option('arrayminus', null);
-    var x, h, l, r, i;
+    var result = new Array(data.length),
+        type = option('type', 'percent'),
+        symmetric = option('symmetric', true),
+        value = +option('value', 10),
+        minusValue = +option('valueminus', 10),
+        error = option('array', null),
+        minusError = option('arrayminus', null);
 
     if(symmetric) {
         minusValue = value;
         minusError = error;
     }
 
-    if(type === 'data' && (!error || !minusError)) {
-        return null;
-    }
+    if(type === 'data' && (!error || !minusError)) return null;
+
+    for(var i = 0; i < data.length; i++) {
+        var x = +data[i];
 
-    for(i=0; i<data.length; ++i) {
-        x = +data[i];
         switch(type) {
         case 'percent':
             h = Math.abs(x) * value / 100.0;
@@ -67,10 +61,8 @@ function calculateAxisErrors(data, params) {
 }
 
 function dataLength(array) {
-    for(var i=0; i<array.length; ++i) {
-        if(array[i]) {
-            return array[i].length;
-        }
+    for(var i = 0; i < array.length; i++) {
+        if(array[i]) return array[i].length;
     }
     return 0;
 }
@@ -80,24 +72,26 @@ function calculateErrors(data) {
         calculateAxisErrors(data.x, data.error_x),
         calculateAxisErrors(data.y, data.error_y),
         calculateAxisErrors(data.z, data.error_z) ],
-        errorBounds,
-        n = dataLength(errors),
-        i, j, k, bound;
-    if(n === 0) {
-        return null;
-    }
-    errorBounds = new Array(n);
-    for(i=0; i<n; ++i) {
-        bound = [[0,0,0],[0,0,0]];
-        for(j=0; j<3; ++j) {
+
+    var n = dataLength(errors);
+    if(n === 0) return null;
+
+    var errorBounds = new Array(n);
+
+    for(var i = 0; i < n; i++) {
+        var bound = [[0,0,0], [0,0,0]];
+
+        for(var j = 0; j < 3; j++) {
             if(errors[j]) {
-                for(k=0; k<2; ++k) {
+                for(var k = 0; k < 2; k++) {
                     bound[k][j] = errors[j][i][k];
                 }
             }
         }
+
         errorBounds[i] = bound;
     }
+
     return errorBounds;
 }
 
diff --git a/src/traces/scatter3d/convert.js b/src/traces/scatter3d/convert.js
@@ -106,20 +106,23 @@ function constructDelaunay(points, color, axis) {
 
 function calculateErrorParams(errors) {
     /*jshint camelcase: false */
-    var capSize = [0.0, 0.0, 0.0], i, e;
-    var color = [[0,0,0],[0,0,0],[0,0,0]];
-    var lineWidth = [0.0, 0.0, 0.0];
-    for(i=0; i<3; ++i) {
-        e = errors[i];
-        if (e && e.copy_zstyle !== false) {
-            e = errors[2];
-        }
+
+    var capSize = [0.0, 0.0, 0.0],
+        color = [[0,0,0], [0,0,0], [0,0,0]],
+        lineWidth = [0.0, 0.0, 0.0];
+
+    for(var i = 0; i < 3; i++) {
+        var e = errors[i];
+
+        if(e && e.copy_zstyle !== false) e = errors[2];
         if(!e) continue;
+
         capSize[i] = e.width / 100.0;  //Ballpark rescaling, attempt to make consistent with plot.ly
         color[i] = str2RgbaArray(e.color);
         lineWidth = e.thickness;
 
     }
+
     return {capSize: capSize, color: color, lineWidth: lineWidth};
 }
 
@@ -173,7 +176,6 @@ function convertPlotlyOptions(scene, data) {
         zaxis = sceneLayout.zaxis,
         marker = data.marker,
         line = data.line,
-        errorParams = calculateErrorParams([ data.error_x, data.error_y, data.error_z ]),
         xc, x = data.x || [],
         yc, y = data.y || [],
         zc, z = data.z || [],
@@ -242,12 +244,13 @@ function convertPlotlyOptions(scene, data) {
     }
 
     params.errorBounds    = calculateError(data);
-    params.errorColor     = errorParams.color;
+    var errorParams = calculateErrorParams([data.error_x, data.error_y, data.error_z]);
+    params.errorColor = errorParams.color;
     params.errorLineWidth = errorParams.lineWidth;
-    params.errorCapSize   = errorParams.capSize;
+    params.errorCapSize = errorParams.capSize;
 
-    params.delaunayAxis       = data.surfaceaxis;
-    params.delaunayColor      = str2RgbaArray(data.surfacecolor);
+    params.delaunayAxis = data.surfaceaxis;
+    params.delaunayColor = str2RgbaArray(data.surfacecolor);
 
     return params;
 }
