Rollback last (bad) improving attempt

[vchess.git] / client / src / views / Hall.vue

diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index bdb2805..94a7bba 100644 (file)
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -317,7 +317,7 @@ export default {
         id: my.id,
         name: my.name,
         tmpIds: {
-          tmpId: { page: "/", focus: true }
+          [tmpId]: { page: "/", focus: true }
         }
       }
     );
@@ -507,7 +507,7 @@ export default {
     },
     invColor: function(c) {
       if (c == 'w') return this.st.tr["Black"];
-      return this.tr.tr["White"];
+      return this.st.tr["White"];
     },
     partialResetNewchallenge: function() {
       // Reset potential target and custom FEN:
@@ -1061,6 +1061,7 @@ export default {
       this.newchallenge.vid = pchall.vid;
       this.newchallenge.cadence = pchall.cadence;
       this.newchallenge.options = pchall.options;
+      this.newchallenge.fromPreset = true;
       this.loadNewchallVariant(this.issueNewChallenge);
     },
     issueNewChallenge: async function() {
@@ -1096,17 +1097,20 @@ export default {
         return;
       }
       window.V = this.newchallenge.V;
-      let chall = Object.assign({}, this.newchallenge, { options: {} });
-      // Get/set options variables (if any) / TODO: v-model?!
-      for (const check of this.newchallenge.V.Options.check || []) {
-        const elt = document.getElementById(check.variable + "_opt");
-        chall.options[check.variable] = elt.checked;
-      }
-      for (const select of this.newchallenge.V.Options.select || []) {
-        const elt = document.getElementById(select.variable + "_opt");
-        const tryIntVal = parseInt(elt.value, 10);
-        chall.options[select.variable] =
-          (isNaN(tryIntVal) ? elt.value : tryIntVal);
+      let chall = Object.assign({}, this.newchallenge);
+      if (!this.newchallenge.fromPreset) chall.options = { options: {} };
+      if (V.Options && !this.newchallenge.fromPreset) {
+        // Get/set options variables (if any) / TODO: v-model?!
+        for (const check of this.newchallenge.V.Options.check || []) {
+          const elt = document.getElementById(check.variable + "_opt");
+          chall.options[check.variable] = elt.checked;
+        }
+        for (const select of this.newchallenge.V.Options.select || []) {
+          const elt = document.getElementById(select.variable + "_opt");
+          const tryIntVal = parseInt(elt.value, 10);
+          chall.options[select.variable] =
+            (isNaN(tryIntVal) ? elt.value : tryIntVal);
+        }
       }
       error = checkChallenge(chall);
       if (error) {
@@ -1476,8 +1480,8 @@ div#peopleWrap > .card
 
 #chat > .card
   max-width: 100%
-  margin: 0;
-  border: none;
+  margin: 0
+  border: none
 
 #players > p
   margin-left: 5px