Skip to content

Bump eslint to 3.9.1 #1127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 9, 2016
Merged

Bump eslint to 3.9.1 #1127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ba88a8
ci: add `npm ls` pretest cmd for debugging purposes
etpinard Nov 9, 2016
77cedf7
deps: bump eslint to ^3.9.1
etpinard Nov 9, 2016
e682d01
lint: fix for new eslint 'indent' requirements
etpinard Nov 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ dependencies:
- npm run cibuild
- npm run pretest
- eval $(node tasks/docker.js setup)
- npm ls

test:
override:
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"browserify-transform-tools": "^1.5.1",
"deep-equal": "^1.0.1",
"ecstatic": "^2.1.0",
"eslint": "^3.5.0",
"eslint": "^3.9.1",
"falafel": "^2.0.0",
"fs-extra": "^0.30.0",
"fuse.js": "^2.2.0",
Expand Down
2 changes: 1 addition & 1 deletion src/plot_api/plot_api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2005,7 +2005,7 @@ function _relayout(gd, aobj) {
*/
else if(['hovermode', 'dragmode'].indexOf(ai) !== -1) flags.domodebar = true;
else if(['hovermode', 'dragmode', 'height',
'width', 'autosize'].indexOf(ai) === -1) {
'width', 'autosize'].indexOf(ai) === -1) {
flags.doplot = true;
}

Expand Down
4 changes: 2 additions & 2 deletions src/plots/cartesian/tick_label_defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ module.exports = function handleTickLabelDefaults(containerIn, containerOut, coe
*/
function getShowAttrDflt(containerIn) {
var showAttrsAll = ['showexponent',
'showtickprefix',
'showticksuffix'],
'showtickprefix',
'showticksuffix'],
showAttrs = showAttrsAll.filter(function(a) {
return containerIn[a] !== undefined;
}),
Expand Down
2 changes: 1 addition & 1 deletion src/plots/geo/set_scale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ function makeRangeBox(lon0, lat0, lon1, lat1) {
return {
type: 'Polygon',
coordinates: [
[ [lon0, lat0],
[ [lon0, lat0],
[lon0, lat1],
[lon0 + dlon4, lat1],
[lon0 + 2 * dlon4, lat1],
Expand Down
6 changes: 3 additions & 3 deletions src/traces/contour/plot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ function makePath(pi, loc, edgeflag) {
// even # of pts - average central two
else {
newpt = [(getpt(ptavg)[0] + getpt(ptavg + 1)[0]) / 2,
(getpt(ptavg)[1] + getpt(ptavg + 1)[1]) / 2];
(getpt(ptavg)[1] + getpt(ptavg + 1)[1]) / 2];
}

pts.splice(cnt2 + 1, cnt - cnt2 + 1, newpt);
Expand Down Expand Up @@ -458,12 +458,12 @@ function getInterpPx(pi, loc, step) {
if(step[1]) {
var dx = (pi.level - zxy) / (pi.z[locy][locx + 1] - zxy);
return [xa.c2p((1 - dx) * pi.x[locx] + dx * pi.x[locx + 1], true),
ya.c2p(pi.y[locy], true)];
ya.c2p(pi.y[locy], true)];
}
else {
var dy = (pi.level - zxy) / (pi.z[locy + 1][locx] - zxy);
return [xa.c2p(pi.x[locx], true),
ya.c2p((1 - dy) * pi.y[locy] + dy * pi.y[locy + 1], true)];
ya.c2p((1 - dy) * pi.y[locy] + dy * pi.y[locy + 1], true)];
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/traces/surface/convert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ function refine(coords) {
var padImg = padField(coords[i]);
var scaledImg = ndarray(new Float32Array(nsize), nshape);
homography(scaledImg, padImg, [scaleF, 0, 0,
0, scaleF, 0,
0, 0, 1]);
0, scaleF, 0,
0, 0, 1]);
coords[i] = scaledImg;
}

Expand Down
74 changes: 37 additions & 37 deletions test/jasmine/tests/heatmap_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,43 +452,43 @@ describe('heatmap plot', function() {

argumentsWithPadding = getContextStub.fillRect.calls.allArgs().slice(getContextStub.fillRect.calls.allArgs().length - 9);
expect(argumentsWithPadding).toEqual([
[argumentsWithoutPadding[0][0],
argumentsWithoutPadding[0][1] + edgeYGap,
argumentsWithoutPadding[0][2] - edgeXGap,
argumentsWithoutPadding[0][3] - edgeYGap],
[argumentsWithoutPadding[1][0] + centerXGap,
argumentsWithoutPadding[1][1] + edgeYGap,
argumentsWithoutPadding[1][2] - edgeXGap,
argumentsWithoutPadding[1][3] - edgeYGap],
[argumentsWithoutPadding[2][0] + edgeXGap,
argumentsWithoutPadding[2][1] + edgeYGap,
argumentsWithoutPadding[2][2] - edgeXGap,
argumentsWithoutPadding[2][3] - edgeYGap],
[argumentsWithoutPadding[3][0],
argumentsWithoutPadding[3][1] + centerYGap,
argumentsWithoutPadding[3][2] - edgeXGap,
argumentsWithoutPadding[3][3] - edgeYGap],
[argumentsWithoutPadding[4][0] + centerXGap,
argumentsWithoutPadding[4][1] + centerYGap,
argumentsWithoutPadding[4][2] - edgeXGap,
argumentsWithoutPadding[4][3] - edgeYGap],
[argumentsWithoutPadding[5][0] + edgeXGap,
argumentsWithoutPadding[5][1] + centerYGap,
argumentsWithoutPadding[5][2] - edgeXGap,
argumentsWithoutPadding[5][3] - edgeYGap],
[argumentsWithoutPadding[6][0],
argumentsWithoutPadding[6][1],
argumentsWithoutPadding[6][2] - edgeXGap,
argumentsWithoutPadding[6][3] - edgeYGap],
[argumentsWithoutPadding[7][0] + centerXGap,
argumentsWithoutPadding[7][1],
argumentsWithoutPadding[7][2] - edgeXGap,
argumentsWithoutPadding[7][3] - edgeYGap],
[argumentsWithoutPadding[8][0] + edgeXGap,
argumentsWithoutPadding[8][1],
argumentsWithoutPadding[8][2] - edgeXGap,
argumentsWithoutPadding[8][3] - edgeYGap
]]);
[argumentsWithoutPadding[0][0],
argumentsWithoutPadding[0][1] + edgeYGap,
argumentsWithoutPadding[0][2] - edgeXGap,
argumentsWithoutPadding[0][3] - edgeYGap],
[argumentsWithoutPadding[1][0] + centerXGap,
argumentsWithoutPadding[1][1] + edgeYGap,
argumentsWithoutPadding[1][2] - edgeXGap,
argumentsWithoutPadding[1][3] - edgeYGap],
[argumentsWithoutPadding[2][0] + edgeXGap,
argumentsWithoutPadding[2][1] + edgeYGap,
argumentsWithoutPadding[2][2] - edgeXGap,
argumentsWithoutPadding[2][3] - edgeYGap],
[argumentsWithoutPadding[3][0],
argumentsWithoutPadding[3][1] + centerYGap,
argumentsWithoutPadding[3][2] - edgeXGap,
argumentsWithoutPadding[3][3] - edgeYGap],
[argumentsWithoutPadding[4][0] + centerXGap,
argumentsWithoutPadding[4][1] + centerYGap,
argumentsWithoutPadding[4][2] - edgeXGap,
argumentsWithoutPadding[4][3] - edgeYGap],
[argumentsWithoutPadding[5][0] + edgeXGap,
argumentsWithoutPadding[5][1] + centerYGap,
argumentsWithoutPadding[5][2] - edgeXGap,
argumentsWithoutPadding[5][3] - edgeYGap],
[argumentsWithoutPadding[6][0],
argumentsWithoutPadding[6][1],
argumentsWithoutPadding[6][2] - edgeXGap,
argumentsWithoutPadding[6][3] - edgeYGap],
[argumentsWithoutPadding[7][0] + centerXGap,
argumentsWithoutPadding[7][1],
argumentsWithoutPadding[7][2] - edgeXGap,
argumentsWithoutPadding[7][3] - edgeYGap],
[argumentsWithoutPadding[8][0] + edgeXGap,
argumentsWithoutPadding[8][1],
argumentsWithoutPadding[8][2] - edgeXGap,
argumentsWithoutPadding[8][3] - edgeYGap
]]);
done();
});
});
Expand Down
6 changes: 3 additions & 3 deletions test/jasmine/tests/lib_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ describe('Test lib.js:', function() {
var colVal = 'red',
sizeVal = 14,
attrs = {testMarker: {testColor: {valType: 'color', dflt: 'rgba(0, 0, 0, 0)'},
testSize: {valType: 'number', dflt: 20}}},
testSize: {valType: 'number', dflt: 20}}},
obj = {testMarker: {testColor: colVal, testSize: sizeVal}},
outObj = {},
colOut = coerce2(obj, outObj, attrs, 'testMarker.testColor'),
Expand All @@ -711,7 +711,7 @@ describe('Test lib.js:', function() {
var colVal = 'r',
sizeVal = 'aaaaah!',
attrs = {testMarker: {testColor: {valType: 'color', dflt: 'rgba(0, 0, 0, 0)'},
testSize: {valType: 'number', dflt: 20}}},
testSize: {valType: 'number', dflt: 20}}},
obj = {testMarker: {testColor: colVal, testSize: sizeVal}},
outObj = {},
colOut = coerce2(obj, outObj, attrs, 'testMarker.testColor'),
Expand All @@ -727,7 +727,7 @@ describe('Test lib.js:', function() {
var colVal = null,
sizeVal = null,
attrs = {testMarker: {testColor: {valType: 'color', dflt: 'rgba(0, 0, 0, 0)'},
testSize: {valType: 'number', dflt: 20}}},
testSize: {valType: 'number', dflt: 20}}},
obj = {testMarker: {testColor: colVal, testSize: sizeVal}},
outObj = {},
colOut = coerce2(obj, outObj, attrs, 'testMarker.testColor'),
Expand Down