From: Carl Worth <cworth@cworth.org>
Date: Mon, 29 Jun 2020 15:29:51 +0000 (-0700)
Subject: Define the move_on button after the still_waiting component
X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=commitdiff_plain;h=d74ef20a871a9548097e3ef4fb3539c2b6a5d0dc;ds=sidebyside

Define the move_on button after the still_waiting component

This is just code movement here with no intended logical change. The
motivation here is so that the "Move On" button can be worded
differently depending on who we're waiting for.
---

diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 6acf526..2511250 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -789,29 +789,6 @@ class ActivePrompt extends React.PureComponent {
   }
 
   render() {
-    let move_on_button = null;
-    if (this.props.idle) {
-      move_on_button =(
-        <button
-          className="vote-button"
-          onClick={() => fetch_post_json(`end-answers/${this.props.prompt.id}`) }
-        >
-          Move On Without Their Answers
-          <div className="vote-choices">
-            {[...this.props.votes].map(v => {
-              return (
-                <div
-                  key={v}
-                  className="vote-choice"
-                >
-                  {v}
-                </div>
-              );
-            })}
-          </div>
-        </button>
-      );
-    }
 
     let still_waiting = null;
     const answering_players = Object.keys(this.props.players_answering);;
@@ -845,6 +822,30 @@ class ActivePrompt extends React.PureComponent {
       );
     }
 
+    let move_on_button = null;
+    if (this.props.idle) {
+      move_on_button =(
+        <button
+          className="vote-button"
+          onClick={() => fetch_post_json(`end-answers/${this.props.prompt.id}`) }
+        >
+          Move On Without Their Answers
+          <div className="vote-choices">
+            {[...this.props.votes].map(v => {
+              return (
+                <div
+                  key={v}
+                  className="vote-choice"
+                >
+                  {v}
+                </div>
+              );
+            })}
+          </div>
+        </button>
+      );
+    }
+
     if (this.props.players_answered.has(this.props.player.name)) {
       return (
         <div className="please-wait">