Skip to content

Commit 3a7fa31

Browse files
vidartfvidartf
committed
eslint
1 parent 72d27dc commit 3a7fa31

28 files changed

+106
-100
lines changed

‎js/.eslintrc.js

+36-19
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,44 @@
11
module.exports = {
2-
"env": {
3-
"browser": true,
4-
"commonjs": true
2+
'env': {
3+
'browser': true,
4+
'commonjs': true,
5+
'es2018': true,
6+
'node': true
57
},
6-
"extends": "eslint:recommended",
7-
"rules": {
8-
"indent": [
9-
"error",
8+
'extends': 'eslint:recommended',
9+
'ignorePatterns': ['dist/**/*', 'lab-dist/**/*'],
10+
'globals': {
11+
'__webpack_public_path__': true
12+
},
13+
'rules': {
14+
'indent': [
15+
'error',
1016
4
1117
],
12-
"linebreak-style": [
13-
"error",
14-
"windows"
18+
'linebreak-style': [
19+
'error',
20+
'windows'
1521
],
16-
"quotes": [
17-
"error",
18-
"single"
22+
'quotes': [
23+
'error',
24+
'single'
1925
],
20-
"semi": [
21-
"error",
22-
"always"
26+
'semi': [
27+
'error',
28+
'always'
2329
],
24-
"no-console": "off",
25-
"no-unused-vars": "warn",
26-
}
30+
'no-console': 'off',
31+
'no-unused-vars': ['warn', { 'args': 'none' }],
32+
'prefer-object-spread': 'error',
33+
},
34+
'overrides': [
35+
{
36+
'files': [ 'src/**/*.autogen.js' ],
37+
'rules': {
38+
'quotes': 0,
39+
'linebreak-style': 0,
40+
'no-unused-vars': 0,
41+
}
42+
}
43+
]
2744
};

‎js/scripts/.eslintrc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module.exports = {
22
"env": {
3-
"es6": true,
3+
"es2018": true,
44
"node": true
55
},
66
"extends": "eslint:recommended",
77
"parserOptions": {
88
"sourceType": "script",
9-
"ecmaVersion": 2017
9+
"ecmaVersion": 2018
1010
},
1111
"rules": {
1212
"indent": [

‎js/scripts/generate-shader-utils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ async function createPythonWrapper(name, relativePath) {
7373
if (data[section]['uniforms'] === undefined) {
7474
continue;
7575
}
76-
serialized[section] = Object.assign({}, data[section]);
76+
serialized[section] = { ...data[section]};
7777
serialized[section]['uniforms'] = serializeUniforms(data[section]['uniforms']);
7878
}
7979
} else {

‎js/scripts/generate-wrappers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ function getClassConfig(className) {
155155

156156
const curClass = classConfigs[className];
157157

158-
const result = Object.assign({}, curClass);
158+
const result = { ...curClass};
159159

160160
result.propsDefinedByThree = [];
161161
result.propsDefinedByThree = result.propsDefinedByThree.concat(curClass.propsDefinedByThree || []);

‎js/scripts/templates/js_index.mustache

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ var loadedModules = [
1515
];
1616

1717
for (var i in loadedModules) {
18-
if (loadedModules.hasOwnProperty(i)) {
18+
if (Object.prototype.hasOwnProperty.call(loadedModules, i)) {
1919
var loadedModule = loadedModules[i];
2020
for (var target_name in loadedModule) {
21-
if (loadedModule.hasOwnProperty(target_name)) {
21+
if (Object.prototype.hasOwnProperty.call(loadedModule, target_name)) {
2222
module.exports[target_name] = loadedModule[target_name];
2323
}
2424
}

‎js/src/_base/Renderable.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ RenderableModel.serializers = {
174174
...widgets.DOMWidgetModel.serializers,
175175
clippingPlanes: { deserialize: unpackThreeModel },
176176
shadowMap: { deserialize: unpackThreeModel },
177-
}
177+
};
178178

179179

180180
class RenderableView extends widgets.DOMWidgetView {

‎js/src/animation/AnimationAction.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class AnimationActionModel extends AnimationActionAutogen {
125125
AnimationActionModel.serializers = {
126126
...AnimationActionAutogen.serializers,
127127
...widgets.DOMWidgetModel.serializers,
128-
}
128+
};
129129

130130

131131
class AnimationActionView extends widgets.DOMWidgetView {

‎js/src/cameras/OrthographicCamera.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
var _ = require('underscore');
21
var OrthographicCameraAutogen = require('./OrthographicCamera.autogen');
32

43
class OrthographicCameraModel extends OrthographicCameraAutogen.OrthographicCameraModel {

‎js/src/cameras/PerspectiveCamera.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
var _ = require('underscore');
21
var PerspectiveCameraAutogen = require('./PerspectiveCamera.autogen');
32

43
class PerspectiveCameraModel extends PerspectiveCameraAutogen.PerspectiveCameraModel {

‎js/src/controls/FlyControls.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
var _ = require('underscore');
21
var THREE = require('three');
32
var FlyControls = require('../examples/controls/MomentumCameraControls.js').FlyControls;
43
var FlyControlsAutogen = require('./FlyControls.autogen');

‎js/src/controls/OrbitControls.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
var _ = require('underscore');
21
var OrbitControls = require('../examples/controls/OrbitControls.js').OrbitControls;
32
var OrbitControlsAutogen = require('./OrbitControls.autogen');
43

‎js/src/controls/Picker.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@ function getinfo(o) {
114114
if (o.face && o.object.geometry.isBufferGeometry) {
115115
v = o.object.geometry.attributes.position.array;
116116
verts = [[v[o.face.a], v[o.face.a] + 1, v[o.face.a] + 2],
117-
[v[o.face.b], v[o.face.b] + 1, v[o.face.b] + 2],
118-
[v[o.face.c], v[o.face.c] + 1, v[o.face.c] + 2]];
117+
[v[o.face.b], v[o.face.b] + 1, v[o.face.b] + 2],
118+
[v[o.face.c], v[o.face.c] + 1, v[o.face.c] + 2]];
119119
} else if (o.face) {
120120
v = o.object.geometry.vertices;
121121
verts = [[v[o.face.a].x, v[o.face.a].y, v[o.face.a].z],
122-
[v[o.face.b].x, v[o.face.b].y, v[o.face.b].z],
123-
[v[o.face.c].x, v[o.face.c].y, v[o.face.c].z]];
122+
[v[o.face.b].x, v[o.face.b].y, v[o.face.b].z],
123+
[v[o.face.c].x, v[o.face.c].y, v[o.face.c].z]];
124124
}
125125
return {
126126
point: [o.point.x, o.point.y, o.point.z],

‎js/src/controls/TrackballControls.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
var _ = require('underscore');
21
var TrackballControls = require('../examples/controls/TrackballControls.js').TrackballControls;
32
var TrackballControlsAutogen = require('./TrackballControls.autogen');
43

‎js/src/core/Renderer.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,16 @@ class RendererModel extends RenderableModel {
5959
this.trigger('rerender', this, {});
6060
}
6161
}
62-
63-
static serializers = {
64-
...RenderableModel.serializers,
65-
scene: { deserialize: unpackThreeModel },
66-
camera: { deserialize: unpackThreeModel },
67-
controls: { deserialize: unpackThreeModel },
68-
effect: { deserialize: unpackThreeModel },
69-
}
7062
}
7163

64+
RendererModel.serializers = {
65+
...RenderableModel.serializers,
66+
scene: { deserialize: unpackThreeModel },
67+
camera: { deserialize: unpackThreeModel },
68+
controls: { deserialize: unpackThreeModel },
69+
effect: { deserialize: unpackThreeModel },
70+
};
71+
7272
class RendererView extends RenderableView {
7373

7474
render() {

‎js/src/examples/.eslintrc.js

+27-26
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
module.exports = {
2-
"env": {
3-
"browser": true,
4-
"commonjs": true
5-
}
6-
"extends": "eslint:recommended",
7-
"rules": {
8-
"indent": [
9-
"error",
10-
"tab"
11-
],
12-
"linebreak-style": [
13-
"error",
14-
"windows"
15-
],
16-
"quotes": [
17-
"error",
18-
"single"
19-
],
20-
"semi": [
21-
"error",
22-
"always"
23-
],
24-
"no-console": "off",
25-
"no-unused-vars": "warn",
26-
"no-redeclare": "warn",
27-
}
2+
'env': {
3+
'browser': true,
4+
'commonjs': true
5+
},
6+
'extends': 'eslint:recommended',
7+
'rules': {
8+
'indent': [
9+
'error',
10+
'tab'
11+
],
12+
'linebreak-style': [
13+
'error',
14+
'windows'
15+
],
16+
'quotes': [
17+
'error',
18+
'single'
19+
],
20+
'semi': [
21+
'error',
22+
'always'
23+
],
24+
'no-console': 'off',
25+
'no-unused-vars': 'warn',
26+
'no-undef': 'warn',
27+
'no-redeclare': 'warn',
28+
}
2829
};

‎js/src/examples/cameras/CombinedCamera.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ CombinedCamera.prototype.copy = function ( source ) {
138138
this.bottom = source.bottom;
139139

140140
this.zoom = source.zoom;
141-
this.view = source.view === null ? null : Object.assign( {}, source.view );
141+
this.view = source.view === null ? null : ({ ...source.view });
142142
this.aspect = source.aspect;
143143

144144
this.cameraO.copy( source.cameraO );

‎js/src/examples/lines/LineMaterial.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -384,11 +384,11 @@ LineMaterial.prototype.copy = function ( source ) {
384384

385385
this.linewidth = source.linewidth;
386386

387-
this.resolution = source.resolution;
387+
this.resolution = source.resolution;
388388

389-
this.dashScale = source.dashScale;
389+
this.dashScale = source.dashScale;
390390

391-
this.dashSize = source.dashSize;
391+
this.dashSize = source.dashSize;
392392

393393
this.gapSize = source.gapSize;
394394

‎js/src/examples/renderers/CanvasRenderer.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ var CanvasRenderer = function ( parameters ) {
4747
_projector = new THREE.Projector(),
4848

4949
_canvas = parameters.canvas !== undefined
50-
? parameters.canvas
51-
: document.createElement( 'canvas' ),
50+
? parameters.canvas
51+
: document.createElement( 'canvas' ),
5252

5353
_canvasWidth = _canvas.width,
5454
_canvasHeight = _canvas.height,
@@ -766,8 +766,8 @@ var CanvasRenderer = function ( parameters ) {
766766
_color.r = _color.g = _color.b = 1 - smoothstep( v1.positionScreen.z * v1.positionScreen.w, _camera.near, _camera.far );
767767

768768
material.wireframe === true
769-
? strokePath( _color, material.wireframeLinewidth, material.wireframeLinecap, material.wireframeLinejoin )
770-
: fillPath( _color );
769+
? strokePath( _color, material.wireframeLinewidth, material.wireframeLinecap, material.wireframeLinejoin )
770+
: fillPath( _color );
771771

772772
} else if ( material instanceof THREE.MeshNormalMaterial ) {
773773

‎js/src/examples/renderers/Projector.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -860,8 +860,8 @@ var Projector = function () {
860860

861861
var alpha1 = 0, alpha2 = 1,
862862

863-
// Calculate the boundary coordinate of each vertex for the near and far clip planes,
864-
// Z = -1 and Z = +1, respectively.
863+
// Calculate the boundary coordinate of each vertex for the near and far clip planes,
864+
// Z = -1 and Z = +1, respectively.
865865
bc1near = s1.z + s1.w,
866866
bc2near = s2.z + s2.w,
867867
bc1far = - s1.z + s1.w,

‎js/src/geometries/LineSegmentsGeometry.js

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
var Promise = require('bluebird');
2-
var dataserializers = require('jupyter-dataserializers');
3-
var ndarray = require('ndarray');
42
var LineSegmentsGeometry = require('../examples/lines/LineSegmentsGeometry.js').LineSegmentsGeometry;
53
var LineSegmentsGeometryAutogen = require('./LineSegmentsGeometry.autogen').LineSegmentsGeometryModel;
64

‎js/src/lights/LightShadow.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
var _ = require('underscore');
21
var LightShadowAutogen = require('./LightShadow.autogen').LightShadowModel;
32

43
class LightShadowModel extends LightShadowAutogen {

‎js/src/objects/CloneArray.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var utils = require('../_base/utils');
77

88
class ThreeCloneArray extends THREE.Object3D {
99
constructor(original, positions, merge) {
10-
THREE.Object3D.call(this);
10+
super();
1111

1212
this.original = original;
1313
this.positions = positions;

‎js/src/objects/Mesh.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
var _ = require('underscore');
21
var MeshAutogen = require('./Mesh.autogen').MeshModel;
32

43

@@ -17,7 +16,7 @@ class MeshModel extends MeshAutogen {
1716
MeshModel.serializers = {
1817
...MeshAutogen.serializers,
1918
morphTargetInfluences: optionalArraySerializer,
20-
}
19+
};
2120

2221
module.exports = {
2322
MeshModel: MeshModel,

‎js/src/renderers/WebGLRenderer.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ class WebGLRendererModel extends RenderableModel {
1515

1616
defaults() {
1717
return _.extend({}, RenderableModel.prototype.defaults, {
18-
_view_name: 'WebGLRendererView',
19-
_model_name: 'WebGLRendererModel',
18+
_view_name: 'WebGLRendererView',
19+
_model_name: 'WebGLRendererModel',
2020

21-
width: 200,
22-
height: 200,
21+
width: 200,
22+
height: 200,
2323

24-
});
24+
});
2525
}
2626

2727
}
2828

2929
WebGLRendererModel.serializers = {
3030
...RenderableModel.serializers,
3131
clippingPlanes: { deserialize: unpackThreeModel },
32-
}
32+
};
3333

3434

3535
class WebGLRendererView extends RenderableView {

‎js/src/renderers/webgl/WebGLShadowMap.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11

2-
var _ = require('underscore');
32
var Promise = require('bluebird');
43

54
var WebGLShadowMapAutogenModel = require('./WebGLShadowMap.autogen').WebGLShadowMapModel;

‎js/src/textures/DataTexture.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
var _ = require('underscore');
21
var Promise = require('bluebird');
32
var dataserializers = require('jupyter-dataserializers');
43
var ndarray = require('ndarray');

‎js/src/textures/DataTexture3D.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
var _ = require('underscore');
21
var Promise = require('bluebird');
32
var dataserializers = require('jupyter-dataserializers');
43
var ndarray = require('ndarray');
@@ -81,7 +80,7 @@ class DataTexture3DModel extends DataTexture3DBase {
8180
DataTexture3DModel.serializers = {
8281
...DataTexture3DBase.serializers,
8382
data: dataserializers.data_union_serialization,
84-
}
83+
};
8584

8685
module.exports = {
8786
DataTexture3DModel: DataTexture3DModel,

0 commit comments

Comments
 (0)