Skip to content

Commit c750179

Browse files
etpinardetpinard
authored
Merge pull request #1127 from plotly/eslint-log-version-on-ci
Bump eslint to 3.9.1
2 parents 62b33d3 + e682d01 commit c750179

File tree

9 files changed

+51
-50
lines changed

9 files changed

+51
-50
lines changed

‎circle.yml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ dependencies:
1717
- npm run cibuild
1818
- npm run pretest
1919
- eval $(node tasks/docker.js setup)
20+
- npm ls
2021

2122
test:
2223
override:

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"browserify-transform-tools": "^1.5.1",
9898
"deep-equal": "^1.0.1",
9999
"ecstatic": "^2.1.0",
100-
"eslint": "^3.5.0",
100+
"eslint": "^3.9.1",
101101
"falafel": "^2.0.0",
102102
"fs-extra": "^0.30.0",
103103
"fuse.js": "^2.2.0",

‎src/plot_api/plot_api.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2005,7 +2005,7 @@ function _relayout(gd, aobj) {
20052005
*/
20062006
else if(['hovermode', 'dragmode'].indexOf(ai) !== -1) flags.domodebar = true;
20072007
else if(['hovermode', 'dragmode', 'height',
2008-
'width', 'autosize'].indexOf(ai) === -1) {
2008+
'width', 'autosize'].indexOf(ai) === -1) {
20092009
flags.doplot = true;
20102010
}
20112011

‎src/plots/cartesian/tick_label_defaults.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ module.exports = function handleTickLabelDefaults(containerIn, containerOut, coe
6767
*/
6868
function getShowAttrDflt(containerIn) {
6969
var showAttrsAll = ['showexponent',
70-
'showtickprefix',
71-
'showticksuffix'],
70+
'showtickprefix',
71+
'showticksuffix'],
7272
showAttrs = showAttrsAll.filter(function(a) {
7373
return containerIn[a] !== undefined;
7474
}),

‎src/plots/geo/set_scale.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ function makeRangeBox(lon0, lat0, lon1, lat1) {
127127
return {
128128
type: 'Polygon',
129129
coordinates: [
130-
[ [lon0, lat0],
130+
[ [lon0, lat0],
131131
[lon0, lat1],
132132
[lon0 + dlon4, lat1],
133133
[lon0 + 2 * dlon4, lat1],

‎src/traces/contour/plot.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ function makePath(pi, loc, edgeflag) {
320320
// even # of pts - average central two
321321
else {
322322
newpt = [(getpt(ptavg)[0] + getpt(ptavg + 1)[0]) / 2,
323-
(getpt(ptavg)[1] + getpt(ptavg + 1)[1]) / 2];
323+
(getpt(ptavg)[1] + getpt(ptavg + 1)[1]) / 2];
324324
}
325325

326326
pts.splice(cnt2 + 1, cnt - cnt2 + 1, newpt);
@@ -458,12 +458,12 @@ function getInterpPx(pi, loc, step) {
458458
if(step[1]) {
459459
var dx = (pi.level - zxy) / (pi.z[locy][locx + 1] - zxy);
460460
return [xa.c2p((1 - dx) * pi.x[locx] + dx * pi.x[locx + 1], true),
461-
ya.c2p(pi.y[locy], true)];
461+
ya.c2p(pi.y[locy], true)];
462462
}
463463
else {
464464
var dy = (pi.level - zxy) / (pi.z[locy + 1][locx] - zxy);
465465
return [xa.c2p(pi.x[locx], true),
466-
ya.c2p((1 - dy) * pi.y[locy] + dy * pi.y[locy + 1], true)];
466+
ya.c2p((1 - dy) * pi.y[locy] + dy * pi.y[locy + 1], true)];
467467
}
468468
}
469469

‎src/traces/surface/convert.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ function refine(coords) {
151151
var padImg = padField(coords[i]);
152152
var scaledImg = ndarray(new Float32Array(nsize), nshape);
153153
homography(scaledImg, padImg, [scaleF, 0, 0,
154-
0, scaleF, 0,
155-
0, 0, 1]);
154+
0, scaleF, 0,
155+
0, 0, 1]);
156156
coords[i] = scaledImg;
157157
}
158158

‎test/jasmine/tests/heatmap_test.js

+37-37
Original file line numberDiff line numberDiff line change
@@ -452,43 +452,43 @@ describe('heatmap plot', function() {
452452

453453
argumentsWithPadding = getContextStub.fillRect.calls.allArgs().slice(getContextStub.fillRect.calls.allArgs().length - 9);
454454
expect(argumentsWithPadding).toEqual([
455-
[argumentsWithoutPadding[0][0],
456-
argumentsWithoutPadding[0][1] + edgeYGap,
457-
argumentsWithoutPadding[0][2] - edgeXGap,
458-
argumentsWithoutPadding[0][3] - edgeYGap],
459-
[argumentsWithoutPadding[1][0] + centerXGap,
460-
argumentsWithoutPadding[1][1] + edgeYGap,
461-
argumentsWithoutPadding[1][2] - edgeXGap,
462-
argumentsWithoutPadding[1][3] - edgeYGap],
463-
[argumentsWithoutPadding[2][0] + edgeXGap,
464-
argumentsWithoutPadding[2][1] + edgeYGap,
465-
argumentsWithoutPadding[2][2] - edgeXGap,
466-
argumentsWithoutPadding[2][3] - edgeYGap],
467-
[argumentsWithoutPadding[3][0],
468-
argumentsWithoutPadding[3][1] + centerYGap,
469-
argumentsWithoutPadding[3][2] - edgeXGap,
470-
argumentsWithoutPadding[3][3] - edgeYGap],
471-
[argumentsWithoutPadding[4][0] + centerXGap,
472-
argumentsWithoutPadding[4][1] + centerYGap,
473-
argumentsWithoutPadding[4][2] - edgeXGap,
474-
argumentsWithoutPadding[4][3] - edgeYGap],
475-
[argumentsWithoutPadding[5][0] + edgeXGap,
476-
argumentsWithoutPadding[5][1] + centerYGap,
477-
argumentsWithoutPadding[5][2] - edgeXGap,
478-
argumentsWithoutPadding[5][3] - edgeYGap],
479-
[argumentsWithoutPadding[6][0],
480-
argumentsWithoutPadding[6][1],
481-
argumentsWithoutPadding[6][2] - edgeXGap,
482-
argumentsWithoutPadding[6][3] - edgeYGap],
483-
[argumentsWithoutPadding[7][0] + centerXGap,
484-
argumentsWithoutPadding[7][1],
485-
argumentsWithoutPadding[7][2] - edgeXGap,
486-
argumentsWithoutPadding[7][3] - edgeYGap],
487-
[argumentsWithoutPadding[8][0] + edgeXGap,
488-
argumentsWithoutPadding[8][1],
489-
argumentsWithoutPadding[8][2] - edgeXGap,
490-
argumentsWithoutPadding[8][3] - edgeYGap
491-
]]);
455+
[argumentsWithoutPadding[0][0],
456+
argumentsWithoutPadding[0][1] + edgeYGap,
457+
argumentsWithoutPadding[0][2] - edgeXGap,
458+
argumentsWithoutPadding[0][3] - edgeYGap],
459+
[argumentsWithoutPadding[1][0] + centerXGap,
460+
argumentsWithoutPadding[1][1] + edgeYGap,
461+
argumentsWithoutPadding[1][2] - edgeXGap,
462+
argumentsWithoutPadding[1][3] - edgeYGap],
463+
[argumentsWithoutPadding[2][0] + edgeXGap,
464+
argumentsWithoutPadding[2][1] + edgeYGap,
465+
argumentsWithoutPadding[2][2] - edgeXGap,
466+
argumentsWithoutPadding[2][3] - edgeYGap],
467+
[argumentsWithoutPadding[3][0],
468+
argumentsWithoutPadding[3][1] + centerYGap,
469+
argumentsWithoutPadding[3][2] - edgeXGap,
470+
argumentsWithoutPadding[3][3] - edgeYGap],
471+
[argumentsWithoutPadding[4][0] + centerXGap,
472+
argumentsWithoutPadding[4][1] + centerYGap,
473+
argumentsWithoutPadding[4][2] - edgeXGap,
474+
argumentsWithoutPadding[4][3] - edgeYGap],
475+
[argumentsWithoutPadding[5][0] + edgeXGap,
476+
argumentsWithoutPadding[5][1] + centerYGap,
477+
argumentsWithoutPadding[5][2] - edgeXGap,
478+
argumentsWithoutPadding[5][3] - edgeYGap],
479+
[argumentsWithoutPadding[6][0],
480+
argumentsWithoutPadding[6][1],
481+
argumentsWithoutPadding[6][2] - edgeXGap,
482+
argumentsWithoutPadding[6][3] - edgeYGap],
483+
[argumentsWithoutPadding[7][0] + centerXGap,
484+
argumentsWithoutPadding[7][1],
485+
argumentsWithoutPadding[7][2] - edgeXGap,
486+
argumentsWithoutPadding[7][3] - edgeYGap],
487+
[argumentsWithoutPadding[8][0] + edgeXGap,
488+
argumentsWithoutPadding[8][1],
489+
argumentsWithoutPadding[8][2] - edgeXGap,
490+
argumentsWithoutPadding[8][3] - edgeYGap
491+
]]);
492492
done();
493493
});
494494
});

‎test/jasmine/tests/lib_test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ describe('Test lib.js:', function() {
695695
var colVal = 'red',
696696
sizeVal = 14,
697697
attrs = {testMarker: {testColor: {valType: 'color', dflt: 'rgba(0, 0, 0, 0)'},
698-
testSize: {valType: 'number', dflt: 20}}},
698+
testSize: {valType: 'number', dflt: 20}}},
699699
obj = {testMarker: {testColor: colVal, testSize: sizeVal}},
700700
outObj = {},
701701
colOut = coerce2(obj, outObj, attrs, 'testMarker.testColor'),
@@ -711,7 +711,7 @@ describe('Test lib.js:', function() {
711711
var colVal = 'r',
712712
sizeVal = 'aaaaah!',
713713
attrs = {testMarker: {testColor: {valType: 'color', dflt: 'rgba(0, 0, 0, 0)'},
714-
testSize: {valType: 'number', dflt: 20}}},
714+
testSize: {valType: 'number', dflt: 20}}},
715715
obj = {testMarker: {testColor: colVal, testSize: sizeVal}},
716716
outObj = {},
717717
colOut = coerce2(obj, outObj, attrs, 'testMarker.testColor'),
@@ -727,7 +727,7 @@ describe('Test lib.js:', function() {
727727
var colVal = null,
728728
sizeVal = null,
729729
attrs = {testMarker: {testColor: {valType: 'color', dflt: 'rgba(0, 0, 0, 0)'},
730-
testSize: {valType: 'number', dflt: 20}}},
730+
testSize: {valType: 'number', dflt: 20}}},
731731
obj = {testMarker: {testColor: colVal, testSize: sizeVal}},
732732
outObj = {},
733733
colOut = coerce2(obj, outObj, attrs, 'testMarker.testColor'),

0 commit comments

Comments
 (0)