lint

plotly · etpinard · May 21, 2019 · Apr 30, 2019 · May 8, 2019 · May 8, 2019
commit fd1083dbc14545a9cfc6d1ab0d6f9e5c09e72305
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -368,7 +368,6 @@ axes.autoBin = function(data, ax, nbins, is2d, calendar, size) {
         axes.autoTicks(dummyAx, size0);
     }
 
-
     var finalSize = dummyAx.dtick;
     var binStart = axes.tickIncrement(
             axes.tickFirst(dummyAx), finalSize, 'reverse', calendar);

diff --git a/src/plots/cartesian/clean_ticks.js b/src/plots/cartesian/clean_ticks.js
@@ -6,7 +6,6 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
 var isNumeric = require('fast-isnumeric');

diff --git a/src/traces/bar/defaults.js b/src/traces/bar/defaults.js
@@ -55,7 +55,7 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
 
 function handleGroupingDefaults(traceIn, traceOut, fullLayout, coerce) {
     var orientation = traceOut.orientation;
-    // N.B. grouping is done across all trace trace types that support it
+    // N.B. grouping is done across all trace types that support it
     var posAxId = traceOut[{v: 'x', h: 'y'}[orientation] + 'axis'];
     var groupId = getAxisGroup(fullLayout, posAxId) + orientation;
 

diff --git a/src/traces/heatmap/calc.js b/src/traces/heatmap/calc.js
@@ -6,7 +6,6 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
 var Registry = require('../../registry');
@@ -21,7 +20,6 @@ var interp2d = require('./interp2d');
 var findEmpties = require('./find_empties');
 var makeBoundArray = require('./make_bound_array');
 
-
 module.exports = function calc(gd, trace) {
     // prepare the raw data
     // run makeCalcdata on x and y even for heatmaps, in case of category mappings

diff --git a/src/traces/histogram/calc.js b/src/traces/histogram/calc.js
@@ -6,7 +6,6 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
 var isNumeric = require('fast-isnumeric');
@@ -21,15 +20,9 @@ var doAvg = require('./average');
 var getBinSpanLabelRound = require('./bin_label_vals');
 
 module.exports = function calc(gd, trace) {
-    // ignore as much processing as possible (and including in autorange) if not visible
-    if(trace.visible !== true) return;
-
-    // depending on orientation, set position and size axes and data ranges
-    // note: this logic for choosing orientation is duplicated in graph_obj->setstyles
     var pos = [];
     var size = [];
-    var pa = Axes.getFromId(gd, trace.orientation === 'h' ?
-        (trace.yaxis || 'y') : (trace.xaxis || 'x'));
+    var pa = Axes.getFromId(gd, trace.orientation === 'h' ? trace.yaxis : trace.xaxis);
     var mainData = trace.orientation === 'h' ? 'y' : 'x';
     var counterData = {x: 'y', y: 'x'}[mainData];
     var calendar = trace[mainData + 'calendar'];
@@ -143,7 +136,6 @@ module.exports = function calc(gd, trace) {
     // after all normalization etc, now we can accumulate if desired
     if(cumulativeSpec.enabled) cdf(size, cumulativeSpec.direction, cumulativeSpec.currentbin);
 
-
     var seriesLen = Math.min(pos.length, size.length);
     var cd = [];
     var firstNonzero = 0;

diff --git a/src/traces/histogram2d/calc.js b/src/traces/histogram2d/calc.js
@@ -6,7 +6,6 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
 var Lib = require('../../lib');
@@ -17,7 +16,6 @@ var normFunctions = require('../histogram/norm_functions');
 var doAvg = require('../histogram/average');
 var getBinSpanLabelRound = require('../histogram/bin_label_vals');
 
-
 module.exports = function calc(gd, trace) {
     var xa = Axes.getFromId(gd, trace.xaxis || 'x');
     var x = trace.x ? xa.makeCalcdata(trace, 'x') : [];
@@ -44,8 +42,8 @@ module.exports = function calc(gd, trace) {
     var z = [];
     var onecol = [];
     var zerocol = [];
-    var nonuniformBinsX = (typeof(trace.xbins.size) === 'string');
-    var nonuniformBinsY = (typeof(trace.ybins.size) === 'string');
+    var nonuniformBinsX = typeof trace.xbins.size === 'string';
+    var nonuniformBinsY = typeof trace.ybins.size === 'string';
     var xEdges = [];
     var yEdges = [];
     var xbins = nonuniformBinsX ? xEdges : trace.xbins;
@@ -55,9 +53,9 @@ module.exports = function calc(gd, trace) {
     var inputPoints = [];
     var norm = trace.histnorm;
     var func = trace.histfunc;
-    var densitynorm = (norm.indexOf('density') !== -1);
-    var extremefunc = (func === 'max' || func === 'min');
-    var sizeinit = (extremefunc ? null : 0);
+    var densitynorm = norm.indexOf('density') !== -1;
+    var extremefunc = func === 'max' || func === 'min';
+    var sizeinit = extremefunc ? null : 0;
     var binfunc = binFunctions.count;
     var normfunc = normFunctions[norm];
     var doavg = false;

diff --git a/src/traces/histogram2d/cross_trace_defaults.js b/src/traces/histogram2d/cross_trace_defaults.js
@@ -6,10 +6,8 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
-
 var isNumeric = require('fast-isnumeric');
 
 var BADNUM = require('../../constants/numerical').BADNUM;

diff --git a/src/traces/histogram2d/defaults.js b/src/traces/histogram2d/defaults.js
@@ -26,8 +26,6 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     if(traceOut.visible === false) return;
 
     handleStyleDefaults(traceIn, traceOut, coerce, layout);
-    colorscaleDefaults(
-        traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'}
-    );
+    colorscaleDefaults(traceIn, traceOut, layout, coerce, {prefix: '', cLetter: 'z'});
     coerce('hovertemplate');
 };
diff --git a/test/jasmine/tests/bar_test.js b/test/jasmine/tests/bar_test.js
@@ -211,7 +211,7 @@ describe('Bar.supplyDefaults', function() {
         expect(traceOut.ycalendar).toBe('ethiopian');
     });
 
-    it('should not include alignementgroup/offsetgroup when barmode is not *group*', function() {
+    it('should not include alignmentgroup/offsetgroup when barmode is not *group*', function() {
         var gd = {
             data: [{type: 'bar', y: [1], alignmentgroup: 'a', offsetgroup: '1'}],
             layout: {barmode: 'group'}

diff --git a/test/jasmine/tests/plot_api_test.js b/test/jasmine/tests/plot_api_test.js
@@ -1297,19 +1297,17 @@ describe('Test plot api', function() {
             ])
             .then(function() {
                 check(true, 'initial');
-                return Plotly.restyle(gd, 'xbins.start', start0, [0]);
-            })
-            .then(function() {
-                return Plotly.restyle(gd, {'xbins.end': end1, 'ybins.size': size1}, null, [1]);
             })
+            .then(function() { return Plotly.restyle(gd, 'xbins.start', start0, [0]); })
+            .then(function() { return Plotly.restyle(gd, {'xbins.end': end1, 'ybins.size': size1}, null, [1]); })
             .then(function() {
                 check(false, 'set start/end/size');
-                return Plotly.restyle(gd, {autobinx: true, autobiny: true});
             })
+            .then(function() { return Plotly.restyle(gd, {autobinx: true, autobiny: true}); })
             .then(function() {
                 check(true, 'reset');
-                return Queue.undo(gd);
             })
+            .then(function() { return Queue.undo(gd); })
             .then(function() {
                 check(false, 'undo');
             })
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ @@
     * LICENSE file in the root directory of this source tree.
     */
     'use strict';
     var isNumeric = require('fast-isnumeric');
@@ Expand Down @@