Skip to content

Commit

Permalink
Merge pull request #7 from Banuba/fix/makeup-applying-issues
Browse files Browse the repository at this point in the history
Fix makeup features applying
  • Loading branch information
UshkalovBanuba authored Nov 8, 2023
2 parents a45aeb5 + 465379e commit 8feea38
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/features/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,18 +101,18 @@ export default {
if (parameter.value === initValue) continue

if (name.includes("shine")) {
if (shine.push(parameter) === 1)
if (shine.push(name) === 1)
features.push({
group: "Lipstick",
name: "Shine",
clear: () => shine.forEach((parameter) => lipstickParams.reset(parameter.name)),
clear: () => shine.forEach((name) => lipstickParams.reset(name)),
})
} else if (name.includes("glitter")) {
if (glitter.push(parameter) === 1)
if (glitter.push(name) === 1)
features.push({
group: "Lipstick",
name: "Glitter",
clear: () => glitter.forEach((parameter) => lipstickParams.reset(parameter.name)),
clear: () => glitter.forEach((name) => lipstickParams.reset(name)),
})
} else {
features.push({
Expand Down
1 change: 1 addition & 0 deletions src/settings/eyes.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export default {
reset() {
this.brows.reset()
this.eyes.reset()
this.eyelashes.reset()
this.makeup.reset()
},
},
Expand Down
2 changes: 1 addition & 1 deletion src/settings/lipstick.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default {
:title="parameter.title"
:value="parameter.value"
@input="params.update({ [name]: { value: $event } })"
:max="['brightness', 'saturation'].includes(name) ? 2 : 1"
:max="['brightness', 'saturation', 'glitterIntensity', 'glitterBleeding', 'glitterGrain'].includes(name) ? 2 : 1"
/>
</bnb-setting>
`,
Expand Down

0 comments on commit 8feea38

Please sign in to comment.