From dbe02614584f66b211e8d245d93f2f82a36a3c67 Mon Sep 17 00:00:00 2001
From: Vas <whiterocket@outlook.com>
Date: Wed, 13 Jun 2018 14:03:29 +0300
Subject: [PATCH] more bugs
---
src/js/rulesAssistantOptions.tw | 87 ++++++++++++++++-----------------
1 file changed, 43 insertions(+), 44 deletions(-)
diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw
index 8b4c0a1344a..2f9cf3a7031 100644
--- a/src/js/rulesAssistantOptions.tw
+++ b/src/js/rulesAssistantOptions.tw
@@ -211,10 +211,10 @@ window.rulesAssistantOptions = (function() {
}
setValue(what) {
- if (this.value.tagName === "input")
- this.value.value = what;
+ if (this.value.tagName === "INPUT")
+ this.value.value = ""+what;
else
- this.value.innerHTML = what;
+ this.value.innerHTML = ""+what;
}
getData(what) {
@@ -602,7 +602,6 @@ window.rulesAssistantOptions = (function() {
class CustomEditor extends Element {
constructor(data) {
- console.log(current_rule.condition, data);
if (data.length === 0) data = "function(slave) { return slave.slaveName === 'Fancy Name'; }";
super(data);
}
@@ -1563,11 +1562,11 @@ window.rulesAssistantOptions = (function() {
constructor() {
const pairs = [
["No default setting", "no default setting"],
- ["None", "None", 0],
- ["Toned", "Toned", 20],
- ["Ripped", "Ripped", 50],
- ["Massive", "Massive", 100],
- ["Weak", "Weak", -20]
+ ["None", 0],
+ ["Toned", 20],
+ ["Ripped", 50],
+ ["Massive", 100],
+ ["Weak", -20]
];
super("Muscles", pairs, true);
this.setValue(current_rule.set.muscles);
@@ -1798,17 +1797,17 @@ window.rulesAssistantOptions = (function() {
combine() {
const lst = [];
if (this.colourlist.value !== "no default setting")
- lst.appendChild(this.colourlist.value);
+ lst.push(this.colourlist.value);
if (this.shapelist.value !== "no default setting")
- list.appendChild(this.shapelist.value);
+ lst.push(this.shapelist.value);
if (lst.length === 0) return "no default value";
else return lst.join(" ");
}
- set_value() {
- const tmp = this.combine();
- this.label.innerText = tmp;
- current_rule.set.eyeColor = tmp;
+ setValue(val) {
+ if (val === undefined) val = this.combine();
+ this.label.innerText = val;
+ current_rule.set.eyeColor = val;
}
}
@@ -1816,22 +1815,22 @@ window.rulesAssistantOptions = (function() {
constructor() {
const items = [];
[
- ["no default setting"],
- ["blue"],
- ["black"],
- ["brown"],
- ["green"],
- ["turquoise"],
- ["sky-blue"],
- ["hazel"],
- ["pale-grey"],
- ["white"],
- ["pink"],
- ["amber"],
- ["red"]
+ "no default setting",
+ "blue",
+ "black",
+ "brown",
+ "green",
+ "turquoise",
+ "sky-blue",
+ "hazel",
+ "pale-grey",
+ "white",
+ "pink",
+ "amber",
+ "red"
].forEach(i => items.push(new OptionsItem(i, item => {
this.value = item.label;
- this.parent.set_value();
+ this.parent.setValue();
})));
super(items);
}
@@ -1841,21 +1840,21 @@ window.rulesAssistantOptions = (function() {
constructor() {
const items = [];
[
- ["no default setting"],
- ["catlike"],
- ["serpent-like"],
- ["devilish"],
- ["demonic"],
- ["hypnotic"],
- ["heart-shaped"],
- ["wide-eyed"],
- ["almond-shaped"],
- ["bright"],
- ["teary"],
- ["vacant"]
+ "no default setting",
+ "catlike",
+ "serpent-like",
+ "devilish",
+ "demonic",
+ "hypnotic",
+ "heart-shaped",
+ "wide-eyed",
+ "almond-shaped",
+ "bright",
+ "teary",
+ "vacant"
].forEach(i => items.push(new OptionsItem(i, item => {
this.value = item.label;
- this.parent.set_value();
+ this.parent.setValue();
})));
super(items);
}
@@ -2868,7 +2867,7 @@ window.rulesAssistantOptions = (function() {
["keep", 1],
["removal", 2],
];
- super("Orifice Tightening", items);
+ super("Body Hair", items);
this.setValue(current_rule.set.surgery_bodyhair);
this.onchange = (value) => current_rule.set.surgery_bodyhair = value;
}
@@ -2881,7 +2880,7 @@ window.rulesAssistantOptions = (function() {
["keep", 1],
["removal", 2],
];
- super("Orifice Tightening", items);
+ super("Hair", items);
this.setValue(current_rule.set.surgery_hair);
this.onchange = (value) => current_rule.set.surgery_hair = value;
}
--
GitLab