From 0a5ba4006b5a9a5c82dd228905a78c594e15f7ae Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sun, 10 Jan 2021 14:56:01 -0800
Subject: [PATCH] Fix growth target lists corrupting RA rules.
---
src/js/rulesAssistantOptions.js | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index dd117c4c7b1..61fbc7a9ad2 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -785,6 +785,13 @@ App.RA.options = (function() {
return what === "" ? null : parseInt(what);
}
+ setValue(what) {
+ if (_.isNumber(what)) { // shortcut list data is just numbers, turn them into targets
+ what = App.RA.makeTarget(this.opSelector.value, what);
+ }
+ super.setValue(what);
+ }
+
setTextValue(what) {
if (typeof what === 'number') { // comes from a pre-set
this.numEditor.value = what.toString();
@@ -801,12 +808,6 @@ App.RA.options = (function() {
const v = this.parse(this.numEditor.value);
return v === null ? null : App.RA.makeTarget(this.opSelector.value, v);
}
-
- propagateChange() {
- if (this.onchange instanceof Function) {
- this.onchange(App.RA.makeTarget(this.opSelector.value, this.getData()));
- }
- }
}
class NumericRangeEditor extends EditorWithShortcuts {
@@ -939,6 +940,13 @@ App.RA.options = (function() {
return res;
}
+ setValue(what) {
+ if (_.isNumber(what)) { // shortcut list data is just numbers, turn them into targets
+ what = App.RA.makeTarget(this.opSelector.value, what);
+ }
+ super.setValue(what);
+ }
+
setTextValue(what) {
if (typeof what === 'number') {
this.numEditor.value = what.toString();
--
GitLab