Skip to content

Commit 6a11e4c

Browse files
authored
Merge pull request #6 from martinRenou/prettier
Run eslint
2 parents 80e6cc9 + 6364161 commit 6a11e4c

4 files changed

Lines changed: 2149 additions & 632 deletions

File tree

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@
6666
"@phosphor/widgets": "^1.6.0",
6767
"@types/d3": "^5.7.2",
6868
"@types/webpack-env": "^1.13.6",
69-
"@typescript-eslint/eslint-plugin": "^3.6.0",
70-
"@typescript-eslint/parser": "^3.6.0",
69+
"@typescript-eslint/eslint-plugin": "^4.29.3",
70+
"@typescript-eslint/parser": "^4.29.3",
7171
"acorn": "^7.2.0",
7272
"css-loader": "^3.2.0",
7373
"eslint": "^7.4.0",
74-
"eslint-config-prettier": "^6.11.0",
75-
"eslint-plugin-prettier": "^3.1.4",
74+
"eslint-config-prettier": "^8.3.0",
75+
"eslint-plugin-prettier": "^3.4.1",
7676
"fs-extra": "^7.0.0",
7777
"identity-obj-proxy": "^3.0.0",
7878
"mkdirp": "^0.5.1",

src/LinesGLView.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ export class LinesGLView extends Lines {
163163
}
164164

165165
renderGL() {
166-
var fig = this.parent;
166+
const fig = this.parent;
167167

168168
const x_scale = this.scales.x ? this.scales.x : this.parent.scale_x;
169169
const y_scale = this.scales.y ? this.scales.y : this.parent.scale_y;

src/ScatterGLView.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@ class AttributeParameters {
111111
class ColorAttributeParameters extends AttributeParameters {
112112
constructor(
113113
array: TypedArray,
114-
item_size: number = 1,
115-
mesh_per_attribute: number = 1,
116-
normalized: boolean = false,
117-
use_colormap: boolean = true
114+
item_size = 1,
115+
mesh_per_attribute = 1,
116+
normalized = false,
117+
use_colormap = true
118118
) {
119119
super(array, item_size, mesh_per_attribute, normalized);
120120
this.use_colormap = use_colormap;
@@ -126,10 +126,10 @@ class ColorAttributeParameters extends AttributeParameters {
126126
class SelectionAttributeParameters extends AttributeParameters {
127127
constructor(
128128
array: TypedArray,
129-
item_size: number = 1,
130-
mesh_per_attribute: number = 1,
131-
normalized: boolean = false,
132-
use_selection: boolean = true
129+
item_size = 1,
130+
mesh_per_attribute = 1,
131+
normalized = false,
132+
use_selection = true
133133
) {
134134
super(array, item_size, mesh_per_attribute, normalized);
135135
this.use_selection = use_selection;
@@ -652,7 +652,7 @@ export class ScatterGLView extends Mark {
652652
value: THREE.InstancedBufferAttribute,
653653
value_previous: THREE.InstancedBufferAttribute,
654654
new_parameters: AttributeParameters,
655-
animate: boolean = true,
655+
animate = true,
656656
after_animation: Function = () => {}
657657
) {
658658
if (animate) {
@@ -727,7 +727,7 @@ export class ScatterGLView extends Mark {
727727
this.transition(set, after_animation, this);
728728
}
729729

730-
updateX(rerender: boolean = true) {
730+
updateX(rerender = true) {
731731
const x_array = to_float_array(this.model.get('x'));
732732

733733
const new_markers_number = Math.min(x_array.length, this.y.array.length);
@@ -749,7 +749,7 @@ export class ScatterGLView extends Mark {
749749
}
750750
}
751751

752-
updateY(rerender: boolean = true) {
752+
updateY(rerender = true) {
753753
const y_array = to_float_array(this.model.get('y'));
754754

755755
const new_markers_number = Math.min(this.x.array.length, y_array.length);
@@ -791,7 +791,7 @@ export class ScatterGLView extends Mark {
791791
}
792792
}
793793

794-
updateColor(rerender: boolean = true) {
794+
updateColor(rerender = true) {
795795
const color_parameters = this.getColorAttributeParameters();
796796
this.color = this.updateAttribute('color', this.color, color_parameters);
797797
this.color.normalized = color_parameters.normalized;
@@ -804,7 +804,7 @@ export class ScatterGLView extends Mark {
804804
}
805805
}
806806

807-
updateOpacity(rerender: boolean = true) {
807+
updateOpacity(rerender = true) {
808808
const opacity_parameters = this.getOpacityAttributeParameters();
809809
[this.opacity, this.opacity_previous] = this.updateAttributes(
810810
'opacity',
@@ -818,7 +818,7 @@ export class ScatterGLView extends Mark {
818818
}
819819
}
820820

821-
updateSize(rerender: boolean = true) {
821+
updateSize(rerender = true) {
822822
const size_parameters = this.getSizeAttributeParameters();
823823
[this.size, this.size_previous] = this.updateAttributes(
824824
'size',
@@ -832,7 +832,7 @@ export class ScatterGLView extends Mark {
832832
}
833833
}
834834

835-
updateRotation(rerender: boolean = true) {
835+
updateRotation(rerender = true) {
836836
const rotation_parameters = this.getRotationAttributeParameters();
837837
[this.rotation, this.rotation_previous] = this.updateAttributes(
838838
'rotation',
@@ -846,7 +846,7 @@ export class ScatterGLView extends Mark {
846846
}
847847
}
848848

849-
updateSelected(rerender: boolean = true) {
849+
updateSelected(rerender = true) {
850850
const selected_parameters = this.getSelectedAttributeParameters();
851851
this.selected = this.updateAttribute(
852852
'selected',

0 commit comments

Comments
 (0)