From 465379ecc0963260fdcb0b7184205f650a1d55cc Mon Sep 17 00:00:00 2001 From: Kirill Ushkalov Date: Wed, 8 Nov 2023 13:35:02 +0300 Subject: [PATCH] Fix makeup features applying --- src/features/index.js | 8 ++++---- src/settings/eyes.js | 1 + src/settings/lipstick.js | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/features/index.js b/src/features/index.js index bb1ab74..75bc7b2 100644 --- a/src/features/index.js +++ b/src/features/index.js @@ -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({ diff --git a/src/settings/eyes.js b/src/settings/eyes.js index e06ee13..b22227b 100644 --- a/src/settings/eyes.js +++ b/src/settings/eyes.js @@ -17,6 +17,7 @@ export default { reset() { this.brows.reset() this.eyes.reset() + this.eyelashes.reset() this.makeup.reset() }, }, diff --git a/src/settings/lipstick.js b/src/settings/lipstick.js index 19a0dec..16bc083 100644 --- a/src/settings/lipstick.js +++ b/src/settings/lipstick.js @@ -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" /> `,