From e78e12f7a779422e24f0f3328ffa21cb15ce21b3 Mon Sep 17 00:00:00 2001
From: Vas <whiterocket@outlook.com>
Date: Fri, 4 May 2018 19:22:09 +0300
Subject: [PATCH] complete cosmetics
---
src/js/rulesAssistantOptions.tw | 171 ++++++++++++++++++++++++++------
1 file changed, 140 insertions(+), 31 deletions(-)
diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw
index bd73fd258a6..2e40634e2c1 100644
--- a/src/js/rulesAssistantOptions.tw
+++ b/src/js/rulesAssistantOptions.tw
@@ -1760,7 +1760,7 @@ window.rulesAssistantOptions = (function() {
["correct with contacts"],
["universal glasses"],
["blur with glasses"],
- ["blur with contacts"],
+ ["blur with contacts"]
].forEach(pair => this.appendChild(new ListItem(...pair)))
this.selectValue(V.currentRule.set.eyewear)
this.onchange = (label, value) => V.currentRule.set.eyewear = value
@@ -1841,7 +1841,7 @@ window.rulesAssistantOptions = (function() {
["almond-shaped"],
["bright"],
["teary"],
- ["vacant"],
+ ["vacant"]
].forEach(i => this.appendChild(new OptionsItem(i, item => {
this.value = item.label
this.parent.set_value()
@@ -1869,7 +1869,13 @@ window.rulesAssistantOptions = (function() {
constructor() {
super("Nails")
[
- [],
+ ["no default setting"],
+ ["clipped", "clipped", 0],
+ ["extended", "extended", 1],
+ ["color-coordinate with hair", "color-coordinate with hair", 2],
+ ["sharp and claw-like", "sharp and claw-like", 3],
+ ["bright and glittery", "bright and glittery", 4],
+ ["hooker nails", "hooker nails", 5]
].forEach(pair => this.appendChild(new ListItem(...pair)))
this.selectValue(V.currentRule.set.nails)
this.onchange = (label, value) => V.currentRule.set.nails = value
@@ -1878,77 +1884,180 @@ window.rulesAssistantOptions = (function() {
class HairLengthList extends List {
constructor() {
- super("Nails")
+ super("Hair length")
[
- [],
+ ["no default setting"],
+ ["very short", "very short", 5],
+ ["short", "short", 10],
+ ["shoulder length", "shoulder length", 30],
+ ["long", "long", 60],
+ ["very long", "very long", 100],
+ ["floor length", "floor length", 150]
].forEach(pair => this.appendChild(new ListItem(...pair)))
- this.selectValue(V.currentRule.set.nails)
- this.onchange = (label, value) => V.currentRule.set.nails = value
+ this.selectValue(V.currentRule.set.hLength)
+ this.onchange = (label, value) => V.currentRule.set.hLength = value
}
}
class HairColourList extends List {
constructor() {
- super("Nails")
+ super("Hair color")
[
- [],
+ ["no default setting"],
+ ["blonde"],
+ ["golden"],
+ ["platinum blonde"],
+ ["strawbery-blonde"],
+ ["copper"],
+ ["ginger"],
+ ["red"]
+ ["green"],
+ ["blue"],
+ ["pink"],
+ ["dark brown"],
+ ["brown"],
+ ["auburn"],
+ ["burgundy"],
+ ["chocolate"],
+ ["chestnut"],
+ ["hazel"],
+ ["black"],
+ ["grey"],
+ ["silver"],
+ ["white"],
+ ["blazing red"],
+ ["neon green"],
+ ["neon blue"],
+ ["neon pink"]
].forEach(pair => this.appendChild(new ListItem(...pair)))
- this.selectValue(V.currentRule.set.nails)
- this.onchange = (label, value) => V.currentRule.set.nails = value
+ this.selectValue(V.currentRule.set.hColor)
+ this.onchange = (label, value) => V.currentRule.set.hColor = value
}
}
class HairStyleList extends List {
constructor() {
- super("Nails")
+ super("Hair style")
[
- [],
+ ["no default setting"],
+ ["neat"],
+ ["shaved"],
+ ["trimmed"],
+ ["buzzcut"],
+ ["up"],
+ ["ponytail"],
+ ["bun"],
+ ["curled"],
+ ["permed"],
+ ["luxurious"],
+ ["dreadlocks"],
+ ["cornrows"],
+ ["braided"],
+ ["tails"],
+ ["afro"],
+ ["strip"]
].forEach(pair => this.appendChild(new ListItem(...pair)))
- this.selectValue(V.currentRule.set.nails)
- this.onchange = (label, value) => V.currentRule.set.nails = value
+ this.selectValue(V.currentRule.set.hStyle)
+ this.onchange = (label, value) => V.currentRule.set.hStyle = value
}
}
class PubicHairColourList extends List {
constructor() {
- super("Nails")
+ super("Pubic hair color, when present")
[
- [],
+ ["no default setting"],
+ ["blonde"],
+ ["golden"],
+ ["platinum blonde"],
+ ["strawerry-blonde"],
+ ["copper"],
+ ["ginger"],
+ ["red"],
+ ["green"],
+ ["blue"],
+ ["pink"],
+ ["dark brown"],
+ ["brown"],
+ ["auburn"],
+ ["burgundy"],
+ ["chocolate"],
+ ["chestnut"],
+ ["hazel"],
+ ["black"],
+ ["grey"],
+ ["silver"],
+ ["white"],
+ ["blazing red"],
+ ["neon green"],
+ ["neon blue"],
+ ["neon pink"]
].forEach(pair => this.appendChild(new ListItem(...pair)))
- this.selectValue(V.currentRule.set.nails)
- this.onchange = (label, value) => V.currentRule.set.nails = value
+ this.selectValue(V.currentRule.set.pubicHColor)
+ this.onchange = (label, value) => V.currentRule.set.pubicHColor = value
}
}
class PubicHairStyleList extends List {
constructor() {
- super("Nails")
+ super("Pubic hairstyle")
[
- [],
+ ["no default setting"],
+ ["waxed"],
+ ["in a strip"],
+ ["neat"],
+ ["bushy"],
+ ["bushy in the front and neat in the rear"],
+ ["very bushy"]
].forEach(pair => this.appendChild(new ListItem(...pair)))
- this.selectValue(V.currentRule.set.nails)
- this.onchange = (label, value) => V.currentRule.set.nails = value
+ this.selectValue(V.currentRule.set.pubicHStyle)
+ this.onchange = (label, value) => V.currentRule.set.pubicHStyle = value
}
}
class ArmpitHairColourList extends List {
constructor() {
- super("Nails")
+ super("Underarm hair color, when present")
[
- [],
+ ["no default setting"],
+ ["blonde"],
+ ["golden"],
+ ["platinum blonde"],
+ ["strawberry-blonde"],
+ ["copper"],
+ ["ginger"],
+ ["red"],
+ ["green"],
+ ["blue"],
+ ["pink"],
+ ["dark brown"],
+ ["brown"],
+ ["auburn"],
+ ["burgundry"],
+ ["chocolate"],
+ ["chestnut"],
+ ["hazel"],
+ ["black"],
+ ["grey"],
+ ["silver"],
+ ["white"]
].forEach(pair => this.appendChild(new ListItem(...pair)))
- this.selectValue(V.currentRule.set.nails)
- this.onchange = (label, value) => V.currentRule.set.nails = value
+ this.selectValue(V.currentRule.set.underArmHColor)
+ this.onchange = (label, value) => V.currentRule.set.underArmHColor = value
}
}
class ArmpitHairStyleList extends List {
constructor() {
- super("Nails")
+ super("Underarm hair style")
[
- [],
+ ["no default setting"],
+ ["waxed"],
+ ["shaved"],
+ ["neat"],
+ ["bushy"]
].forEach(pair => this.appendChild(new ListItem(...pair)))
- this.selectValue(V.currentRule.set.nails)
- this.onchange = (label, value) => V.currentRule.set.nails = value
+ this.selectValue(V.currentRule.set.underArmHStyle)
+ this.onchange = (label, value) => V.currentRule.set.underArmHStyle = value
}
}
})()
--
GitLab