Skip to content

Commit cd3f9ba

Browse files
Merge pull request #24 from Exabyte-io/fix/SOF-6197
chore: rename static class variables
2 parents a9cc8ff + 3743d96 commit cd3f9ba

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/context/mixins.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ export const ApplicationContextMixin = (superclass) =>
77
class extends superclass {
88
constructor(config) {
99
super(config);
10-
if (!this.constructor.applicationCls)
11-
throw Error("ApplicationContextMixin: applicationCls is undefined");
10+
if (!this.constructor.Application)
11+
throw Error("ApplicationContextMixin: Application is undefined");
1212
this._application =
1313
(config.context && config.context.application) ||
14-
this.constructor.applicationCls.createDefault();
14+
this.constructor.Application.createDefault();
1515
}
1616

1717
get application() {
@@ -23,11 +23,11 @@ export const MaterialContextMixin = (superclass) =>
2323
class extends superclass {
2424
constructor(config) {
2525
super(config);
26-
if (!this.constructor.materialCls) {
27-
throw Error("MaterialContextMixin: materialCls is undefined");
26+
if (!this.constructor.Material) {
27+
throw Error("MaterialContextMixin: Material is undefined");
2828
}
2929
this._material = config.context && config.context.material;
30-
if (!this._material) this._material = this.constructor.materialCls.createDefault();
30+
if (!this._material) this._material = this.constructor.Material.createDefault();
3131
this.updateMaterialHash();
3232
}
3333

@@ -82,13 +82,13 @@ export const MaterialsContextMixin = (superclass) =>
8282
constructor(config) {
8383
super(config);
8484
const materials = this.config.context && this.config.context.materials;
85-
if (!this.constructor.materialCls) {
86-
throw Error("MaterialsContextMixin: materialCls is undefined");
85+
if (!this.constructor.Material) {
86+
throw Error("MaterialsContextMixin: Material is undefined");
8787
}
8888
this._materials =
8989
materials && materials.length
9090
? materials
91-
: [this.constructor.materialCls.createDefault()];
91+
: [this.constructor.Material.createDefault()];
9292
}
9393

9494
get materials() {

tests/context.tests.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ class ProviderEntity extends mix(InMemoryEntity).with(
3232
MaterialContextMixin,
3333
ApplicationContextMixin,
3434
) {
35-
static materialCls = MockMaterial;
35+
static Material = MockMaterial;
3636

37-
static applicationCls = MockApplication;
37+
static Application = MockApplication;
3838
}
3939

4040
class DerivedProviderEntity extends ProviderEntity {
41-
static materialCls = SpecificMockMaterial;
41+
static Material = SpecificMockMaterial;
4242

43-
static applicationCls = SpecificMockApplication;
43+
static Application = SpecificMockApplication;
4444
}
4545

4646
describe("Material & Application ContextMixin", () => {

0 commit comments

Comments
 (0)