Skip to content

Commit ac67e6c

Browse files
committed
Lint ES5
1 parent c6b025b commit ac67e6c

33 files changed

+264
-226
lines changed

js/.eslintrc.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
module.exports = {
2+
"env": {
3+
"browser": true,
4+
"commonjs": true
5+
},
6+
"extends": "eslint:recommended",
7+
"rules": {
8+
"indent": [
9+
"error",
10+
4
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+
}
27+
};

js/scripts/templates/js_enums.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
var {{ category.key }} = {
99
{{#each category.enums as |enum|}}
10-
{{ enum.value }}: "{{ enum.key }}",
10+
{{ enum.value }}: '{{ enum.key }}',
1111
{{/each}}
1212
};
1313
{{/each}}

js/src/_base/Preview.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
var _ = require('underscore');
2-
var widgets = require("@jupyter-widgets/base");
3-
var Promise = require('bluebird');
4-
var $ = require('jquery');
2+
var widgets = require('@jupyter-widgets/base');
53

64
var THREE = require('three');
75

86
var Renderable = require('./Renderable');
97
var RenderableView = Renderable.RenderableView;
108
var RenderableModel = Renderable.RenderableModel;
11-
var OrbitControls = require("../examples/controls/OrbitControls.js").OrbitControls;
9+
var OrbitControls = require('../examples/controls/OrbitControls.js').OrbitControls;
1210
var utils = require('./utils.js');
1311

1412

@@ -56,6 +54,8 @@ var PreviewView = RenderableView.extend({
5654

5755
this.clearScene();
5856

57+
var geometry, mesh;
58+
5959
if (obj.isObject3D) {
6060

6161
this.log('render Object3D');
@@ -85,7 +85,7 @@ var PreviewView = RenderableView.extend({
8585
material.vertexColors = THREE.VertexColors;
8686
}
8787

88-
var mesh = new THREE.Mesh(obj, material);
88+
mesh = new THREE.Mesh(obj, material);
8989
this.scene.add(mesh);
9090

9191
} else if (obj.isMaterial) {
@@ -101,21 +101,21 @@ var PreviewView = RenderableView.extend({
101101
}
102102
this.scene.add(sprite);
103103
} else {
104-
var geometry = new THREE.SphereGeometry(15, 16, 12);
105-
var mesh = new THREE.Mesh(geometry, obj);
104+
geometry = new THREE.SphereGeometry(15, 16, 12);
105+
mesh = new THREE.Mesh(geometry, obj);
106106
this.scene.add(mesh);
107107
}
108108

109109
} else if (obj.isTexture) {
110110

111-
var geometry = new THREE.SphereGeometry(15, 16, 12);
111+
geometry = new THREE.SphereGeometry(15, 16, 12);
112112
var mat = new THREE.MeshStandardMaterial({ map: obj });
113-
var mesh = new THREE.Mesh(geometry, mat);
113+
mesh = new THREE.Mesh(geometry, mat);
114114
this.scene.add(mesh);
115115

116116
} else {
117117

118-
console.log("Unexpected object in preview, scene will be empty:", obj);
118+
console.log('Unexpected object in preview, scene will be empty:', obj);
119119

120120
}
121121

@@ -135,7 +135,7 @@ var PreviewView = RenderableView.extend({
135135

136136
resetCamera: function() {
137137
// Compute bounding sphere for entire scene
138-
const sphere = utils.computeBoundingSphere(this.scene);
138+
var sphere = utils.computeBoundingSphere(this.scene);
139139
if (sphere === null) {
140140
sphere = new THREE.Sphere(new THREE.Vector3(), 1);
141141
}
@@ -144,13 +144,13 @@ var PreviewView = RenderableView.extend({
144144
utils.lookAtSphere(this.camera, sphere.center, sphere.radius);
145145

146146
// Update controls with new target
147-
const control = this.controls[0];
147+
var control = this.controls[0];
148148
control.target.copy(sphere.center);
149149
control.target0.copy(sphere.center);
150150
control.update();
151151

152152
// Position light up to the left and behind camera
153-
const dist = 2.5 * (this.camera.position.z - sphere.center.z);
153+
var dist = 2.5 * (this.camera.position.z - sphere.center.z);
154154
this.pointLight.position.set(-dist, dist, dist);
155155
},
156156

js/src/_base/Renderable.js

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var _ = require('underscore');
2-
var widgets = require("@jupyter-widgets/base");
2+
var widgets = require('@jupyter-widgets/base');
33
var Promise = require('bluebird');
44
var $ = require('jquery');
55

@@ -121,7 +121,7 @@ var RenderableView = widgets.DOMWidgetView.extend({
121121
},
122122

123123
doRender: function() {
124-
this.el.className = "jupyter-widget jupyter-threejs";
124+
this.el.className = 'jupyter-widget jupyter-threejs';
125125

126126
this.unfreeze();
127127

@@ -176,11 +176,12 @@ var RenderableView = widgets.DOMWidgetView.extend({
176176
this.renderer[propName] = this.model.get(propName);
177177
return;
178178
}
179+
var converterFn;
179180
if (converterName === 'convertThreeTypeArray') {
180-
var converterFn = this[converterName].bind(this);
181+
converterFn = this[converterName].bind(this);
181182
} else {
182-
converterName = converterName + "ModelToThree";
183-
var converterFn = ThreeModel.prototype[converterName];
183+
converterName = converterName + 'ModelToThree';
184+
converterFn = ThreeModel.prototype[converterName];
184185
}
185186

186187
if (!converterFn) {
@@ -211,11 +212,12 @@ var RenderableView = widgets.DOMWidgetView.extend({
211212
changes = true;
212213
return;
213214
}
215+
var converterFn;
214216
if (converterName === 'convertThreeTypeArray') {
215-
var converterFn = this[converterName].bind(this);
217+
converterFn = this[converterName].bind(this);
216218
} else {
217-
converterName = converterName + "ModelToThree";
218-
var converterFn = ThreeModel.prototype[converterName];
219+
converterName = converterName + 'ModelToThree';
220+
converterFn = ThreeModel.prototype[converterName];
219221
}
220222

221223
if (!converterFn) {
@@ -367,10 +369,10 @@ var RenderableView = widgets.DOMWidgetView.extend({
367369

368370
onCustomMessage: function(content, buffers) {
369371
switch(content.type) {
370-
case 'freeze':
371-
this.freeze();
372-
break;
373-
default:
372+
case 'freeze':
373+
this.freeze();
374+
break;
375+
default:
374376
}
375377
},
376378

js/src/_base/RendererPool.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ _.extend(RendererPool.prototype, {
7272
// required for converting canvas to png
7373
preserveDrawingBuffer: true
7474
}
75-
));
75+
));
7676
renderer.setPixelRatio(window.devicePixelRatio || 1);
77-
renderer.context.canvas.addEventListener("webglcontextlost", this.onContextLost.bind(this), false);
77+
renderer.context.canvas.addEventListener('webglcontextlost', this.onContextLost.bind(this), false);
7878
renderer.poolId = this.numCreated;
7979
this.numCreated++;
8080
return renderer;

0 commit comments

Comments
 (0)