From effee9c6f848b118acb26df6ffeb1012c64912b2 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Wed, 9 Sep 2020 16:21:32 -0400
Subject: [PATCH] use data for colors too
---
src/js/rulesAssistantOptions.js | 144 +-------------------------------
1 file changed, 4 insertions(+), 140 deletions(-)
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index cf8038dccfa..c9fd0f75c18 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -3074,41 +3074,7 @@ globalThis.rulesAssistantOptions = (function() {
class HairColorList extends ListSelector {
constructor() {
- const pairs = [
- ["blonde"],
- ["golden"],
- ["platinum blonde"],
- ["strawberry-blonde"],
- ["copper"],
- ["ginger"],
- ["red"],
- ["deep red"],
- ["green"],
- ["blue"],
- ["pink"],
- ["dark brown"],
- ["brown"],
- ["auburn"],
- ["burgundy"],
- ["chocolate"],
- ["chestnut"],
- ["hazel"],
- ["jet black"],
- ["black"],
- ["grey"],
- ["silver"],
- ["white"],
- ["blue-violet"],
- ["purple"],
- ["dark orchid"],
- ["sea green"],
- ["green-yellow"],
- ["dark blue"],
- ["blazing red"],
- ["neon green"],
- ["neon blue"],
- ["neon pink"]
- ];
+ const pairs = App.Medicine.Modification.Color.Primary.map(c => [c.value]);
super("Hair color", pairs);
this.setValue(current_rule.set.hColor);
this.onchange = (value) => current_rule.set.hColor = value;
@@ -3160,41 +3126,7 @@ globalThis.rulesAssistantOptions = (function() {
class EyebrowColorList extends ListSelector {
constructor() {
- const pairs = [
- ["blonde"],
- ["golden"],
- ["platinum blonde"],
- ["strawberry-blonde"],
- ["copper"],
- ["ginger"],
- ["red"],
- ["deep red"],
- ["green"],
- ["blue"],
- ["pink"],
- ["dark brown"],
- ["brown"],
- ["auburn"],
- ["burgundy"],
- ["chocolate"],
- ["chestnut"],
- ["hazel"],
- ["jet black"],
- ["black"],
- ["grey"],
- ["silver"],
- ["white"],
- ["blue-violet"],
- ["purple"],
- ["dark orchid"],
- ["sea green"],
- ["green-yellow"],
- ["dark blue"],
- ["blazing red"],
- ["neon green"],
- ["neon blue"],
- ["neon pink"]
- ];
+ const pairs = App.Medicine.Modification.Color.Primary.map(c => [c.value]);
super("Eyebrow hair color, when present", pairs);
this.setValue(current_rule.set.eyebrowHColor);
this.onchange = (value) => current_rule.set.eyebrowHColor = value;
@@ -3253,41 +3185,7 @@ globalThis.rulesAssistantOptions = (function() {
class PubicHairColorList extends ListSelector {
constructor() {
- const pairs = [
- ["blonde"],
- ["golden"],
- ["platinum blonde"],
- ["strawberry-blonde"],
- ["copper"],
- ["ginger"],
- ["red"],
- ["deep red"],
- ["green"],
- ["blue"],
- ["pink"],
- ["dark brown"],
- ["brown"],
- ["auburn"],
- ["burgundy"],
- ["chocolate"],
- ["chestnut"],
- ["hazel"],
- ["jet black"],
- ["black"],
- ["grey"],
- ["silver"],
- ["white"],
- ["blue-violet"],
- ["purple"],
- ["dark orchid"],
- ["sea green"],
- ["green-yellow"],
- ["dark blue"],
- ["blazing red"],
- ["neon green"],
- ["neon blue"],
- ["neon pink"]
- ];
+ const pairs = App.Medicine.Modification.Color.Primary.map(c => [c.value]);
super("Pubic hair color, when present", pairs);
this.setValue(current_rule.set.pubicHColor);
this.onchange = (value) => current_rule.set.pubicHColor = value;
@@ -3312,41 +3210,7 @@ globalThis.rulesAssistantOptions = (function() {
class ArmpitHairColorList extends ListSelector {
constructor() {
- const pairs = [
- ["blonde"],
- ["golden"],
- ["platinum blonde"],
- ["strawberry-blonde"],
- ["copper"],
- ["ginger"],
- ["red"],
- ["deep red"],
- ["green"],
- ["blue"],
- ["pink"],
- ["dark brown"],
- ["brown"],
- ["auburn"],
- ["burgundy"],
- ["chocolate"],
- ["chestnut"],
- ["hazel"],
- ["jet black"],
- ["black"],
- ["grey"],
- ["silver"],
- ["white"],
- ["blue-violet"],
- ["purple"],
- ["dark orchid"],
- ["sea green"],
- ["green-yellow"],
- ["dark blue"],
- ["blazing red"],
- ["neon green"],
- ["neon blue"],
- ["neon pink"]
- ];
+ const pairs = App.Medicine.Modification.Color.Primary.map(c => [c.value]);
super("Underarm hair color, when present", pairs);
this.setValue(current_rule.set.underArmHColor);
this.onchange = (value) => current_rule.set.underArmHColor = value;
--
GitLab