Skip to content

Commit d3d3fb2

Browse files
author
Nir Maoz
authored
Fix strength listed as level for toJson of unsharpMask, vignette, oilPaint (#499)
1 parent 47054b1 commit d3d3fb2

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

__TESTS__/unit/toJson/adjust.toJson.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ describe('Adjust toJson()', () => {
2020
expect(transformation.toJson()).toStrictEqual( [
2121
{
2222
actionType: 'unsharpMask',
23-
level: 10
23+
strength: 10
2424
}
2525
]);
2626
});

__TESTS__/unit/toJson/effect.toJson.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ describe('Effect toJson()', () => {
101101
expect(transformation.toJson()).toStrictEqual( [
102102
{
103103
actionType: 'oilPaint',
104-
level: 8,
104+
strength: 8,
105105
}
106106
]);
107107
});
@@ -192,7 +192,7 @@ describe('Effect toJson()', () => {
192192
expect(transformation.toJson()).toStrictEqual( [
193193
{
194194
actionType: 'vignette',
195-
level: 5,
195+
strength: 5,
196196
}
197197
]);
198198
});

src/actions/effect/EffectActions/EffectActionWithStrength.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import {LeveledEffectAction} from "./LeveledEffectAction.js";
77
* @see Visit {@link Actions.Effect|Effect} for an example
88
*/
99
class EffectActionWithStrength extends LeveledEffectAction {
10+
LEVEL_NAME = 'strength';
11+
1012
strength(value: number | string): this {
1113
return this.setLevel(value);
1214
}

src/actions/effect/EffectActions/LeveledEffectAction.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import {SimpleEffectAction} from "./SimpleEffectAction.js";
22
import {ExpressionQualifier} from "../../../qualifiers/expression/ExpressionQualifier.js";
33
import {IColorizeModel, IEffectActionWithLevelModel} from "../../../internal/models/IEffectActionModel.js";
44
import {EFFECT_MODE_TO_ACTION_TYPE_MAP} from "../../../internal/internalConstants.js";
5-
65
/**
76
* @description A base class for effects with a level, the extending class needs to implement a method that calls setLevel()
87
* @extends {Actions.Effect.SimpleEffectAction}
98
* @memberOf Actions.Effect
109
* @see Visit {@link Actions.Effect|Effect} for an example
1110
*/
1211
class LeveledEffectAction extends SimpleEffectAction {
12+
protected LEVEL_NAME = 'level';
1313
protected _actionModel: IEffectActionWithLevelModel | IColorizeModel = {};
1414
protected effectType: string;
1515
constructor(effectType?: string, level?: number|string) {
@@ -18,7 +18,7 @@ class LeveledEffectAction extends SimpleEffectAction {
1818
this._actionModel.actionType = EFFECT_MODE_TO_ACTION_TYPE_MAP[effectType] || effectType;
1919

2020
if(level){
21-
this._actionModel.level = level as number;
21+
this.setLevel(level);
2222
}
2323
}
2424

@@ -29,7 +29,7 @@ class LeveledEffectAction extends SimpleEffectAction {
2929
* @protected
3030
*/
3131
protected setLevel(level: string | number | ExpressionQualifier): this {
32-
this._actionModel.level = level as number;
32+
this._actionModel[this.LEVEL_NAME] = level as number;
3333
const qualifierEffect = this.createEffectQualifier(this.effectType, level);
3434
this.addQualifier(qualifierEffect);
3535
return this;

0 commit comments

Comments
 (0)