diff --git a/circle.yml b/circle.yml index de83f09b7ac..5919efe0ab5 100644 --- a/circle.yml +++ b/circle.yml @@ -17,6 +17,7 @@ dependencies: - npm run cibuild - npm run pretest - eval $(node tasks/docker.js setup) + - npm ls test: override: diff --git a/package.json b/package.json index ba8008d9ffa..d4f7a961095 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/plot_api/plot_api.js b/src/plot_api/plot_api.js index fa45556f741..1507ba5e1fa 100644 --- a/src/plot_api/plot_api.js +++ b/src/plot_api/plot_api.js @@ -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; } diff --git a/src/plots/cartesian/tick_label_defaults.js b/src/plots/cartesian/tick_label_defaults.js index 148368cb6b4..0d1ebebab74 100644 --- a/src/plots/cartesian/tick_label_defaults.js +++ b/src/plots/cartesian/tick_label_defaults.js @@ -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; }), diff --git a/src/plots/geo/set_scale.js b/src/plots/geo/set_scale.js index 70d7220eccf..45c437bb1fb 100644 --- a/src/plots/geo/set_scale.js +++ b/src/plots/geo/set_scale.js @@ -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], diff --git a/src/traces/contour/plot.js b/src/traces/contour/plot.js index 21076c87139..15471d82eba 100644 --- a/src/traces/contour/plot.js +++ b/src/traces/contour/plot.js @@ -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); @@ -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)]; } } diff --git a/src/traces/surface/convert.js b/src/traces/surface/convert.js index ac87cf277b1..2b3fbbda9ee 100644 --- a/src/traces/surface/convert.js +++ b/src/traces/surface/convert.js @@ -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; } diff --git a/test/jasmine/tests/heatmap_test.js b/test/jasmine/tests/heatmap_test.js index b10652a6548..61ccf74f4bf 100644 --- a/test/jasmine/tests/heatmap_test.js +++ b/test/jasmine/tests/heatmap_test.js @@ -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(); }); }); diff --git a/test/jasmine/tests/lib_test.js b/test/jasmine/tests/lib_test.js index f57d5c2fc17..1cba4bd7745 100644 --- a/test/jasmine/tests/lib_test.js +++ b/test/jasmine/tests/lib_test.js @@ -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'), @@ -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'), @@ -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'),