X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=empathy%2Fempathy.jsx;h=e887b1b8b9b1af33ddc76aa751613f66a2253205;hb=49d80bcfff46b8d9efa846decf9415e43ea354f5;hp=6133463f35a7a9d6ba4d58cbe8e4188bf4af48a9;hpb=f8b6dc7aef51ccc82d163f015612c7640f0be365;p=lmno.games

diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 6133463..e887b1b 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -569,6 +569,31 @@ class Ambiguities extends React.PureComponent {
       );
     }
 
+    let still_waiting = null;
+    const judging_players = Object.keys(this.props.players_judging);
+    if (judging_players.length) {
+      still_waiting = [
+        <p>
+          Still waiting for the following player
+          {judging_players.length > 1 ? 's' : '' }
+          :
+        </p>,
+        <ul>
+          {judging_players.map(player => {
+            return (
+              <li
+                key={player}
+              >
+                {player}
+                {this.props.players_judging[player] ?
+                 <span className="typing"/> : null }
+              </li>
+            );
+          })}
+        </ul>
+      ];
+    }
+
     if (this.props.players_judged.has(this.props.player.name)) {
       return (
         <div className="please-wait">
@@ -577,22 +602,7 @@ class Ambiguities extends React.PureComponent {
             The following players have completed judging:{' '}
             {[...this.props.players_judged].join(', ')}
           </p>
-          <p>
-            Still waiting for the following players:
-          </p>
-          <ul>
-            {Object.keys(this.props.players_judging).map(player => {
-              return (
-                <li
-                  key={player}
-                >
-                  {player}
-                  {this.props.players_judging[player] ?
-                   <span className="typing"/> : null }
-                </li>
-              );
-            })}
-          </ul>
+          {still_waiting}
           {move_on_button}
 
         </div>
@@ -732,6 +742,31 @@ class ActivePrompt extends React.PureComponent {
       );
     }
 
+    let still_waiting = null;
+    const answering_players = Object.keys(this.props.players_answering);;
+    if (answering_players.length) {
+      still_waiting = [
+        <p>
+          Still waiting for the following player
+          {answering_players.length > 1 ? 's' : ''}
+          :
+        </p>,
+        <ul>
+           {answering_players.map(player => {
+             return (
+               <li
+                 key={player}
+               >
+                 {player}
+                 {this.props.players_answering[player] ?
+                  <span className="typing"/> : null }
+               </li>
+             );
+           })}
+        </ul>
+      ];
+    }
+
     if (this.props.players_answered.has(this.props.player.name)) {
       return (
         <div className="please-wait">
@@ -740,22 +775,7 @@ class ActivePrompt extends React.PureComponent {
             The following players have submitted their answers:{' '}
             {[...this.props.players_answered].join(', ')}
           </p>
-          <p>
-          Still waiting for the following players:
-          </p>
-          <ul>
-            {Object.keys(this.props.players_answering).map(player => {
-              return (
-                <li
-                  key={player}
-                >
-                  {player}
-                  {this.props.players_answering[player] ?
-                   <span className="typing"/> : null }
-                </li>
-              );
-            })}
-          </ul>
+          {still_waiting}
           {move_on_button}
 
         </div>