X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=143acd930824a564af6a7153cbbd3b37006a54fc;hp=3869b3a249f12ff169a62e7dca85a789c4beb2da;hb=182083e7c5284b7e373a133dce71eac86cb365f7;hpb=533300fbcbfec8c219901cbde2d9c6f336939f97
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 3869b3a..143acd9 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -570,25 +570,35 @@ class Ambiguities extends React.PureComponent {
}
let still_waiting = null;
- if (Object.keys(this.props.players_judging).length) {
- still_waiting = [
-
- Still waiting for the following players:
-
,
-
- {Object.keys(this.props.players_judging).map(player => {
- return (
- -
- {player}
- {this.props.players_judging[player] ?
- : null }
-
- );
- })}
-
- ];
+ const judging_players = Object.keys(this.props.players_judging);
+ if (judging_players.length) {
+ still_waiting = (
+
+
+ Still waiting for the following player
+ {judging_players.length > 1 ? 's' : '' }
+ :
+
+
+ {judging_players.map(player => {
+ return (
+ -
+ {player}{' '}
+
+ {'.'}{'.'}{'.'}
+
+
+ );
+ })}
+
+
+ );
}
if (this.props.players_judged.has(this.props.player.name)) {
@@ -740,25 +750,35 @@ class ActivePrompt extends React.PureComponent {
}
let still_waiting = null;
- if (Object.keys(this.props.players_answering).length) {
- still_waiting = [
-
- Still waiting for the following players:
-
,
-
- {Object.keys(this.props.players_answering).map(player => {
- return (
- -
- {player}
- {this.props.players_answering[player] ?
- : null }
-
- );
- })}
-
- ];
+ const answering_players = Object.keys(this.props.players_answering);;
+ if (answering_players.length) {
+ still_waiting = (
+
+
+ Still waiting for the following player
+ {answering_players.length > 1 ? 's' : ''}
+ :
+
+
+ {answering_players.map(player => {
+ return (
+ -
+ {player}{' '}
+
+ {'.'}{'.'}{'.'}
+
+
+ );
+ })}
+
+
+ );
}
if (this.props.players_answered.has(this.props.player.name)) {
@@ -944,12 +964,29 @@ class Game extends React.PureComponent {
}
set_player_answering(player) {
+ /* Set the player as actively answering now. */
this.setState({
players_answering: {
...this.state.players_answering,
[player]: {active: true}
}
});
+ /* And arrange to have them marked idle very shortly.
+ *
+ * Note: This timeout is intentionally very, very short. We only
+ * need it long enough that the browser has latched onto the state
+ * change to "active" above. We actually use a CSS transition
+ * delay to control the user-perceptible length of time after
+ * which an active player appears inactive.
+ */
+ setTimeout(() => {
+ this.setState({
+ players_answering: {
+ ...this.state.players_answering,
+ [player]: {active: false}
+ }
+ });
+ }, 100);
}
set_answering_idle(value) {
@@ -1009,12 +1046,30 @@ class Game extends React.PureComponent {
}
set_player_judging(player) {
+ /* Set the player as actively judging now. */
this.setState({
players_judging: {
...this.state.players_judging,
[player]: {active: true}
}
});
+ /* And arrange to have them marked idle very shortly.
+ *
+ * Note: This timeout is intentionally very, very short. We only
+ * need it long enough that the browser has latched onto the state
+ * change to "active" above. We actually use a CSS transition
+ * delay to control the user-perceptible length of time after
+ * which an active player appears inactive.
+ */
+ setTimeout(() => {
+ this.setState({
+ players_judging: {
+ ...this.state.players_judging,
+ [player]: {active: false}
+ }
+ });
+ }, 100);
+
}
set_judging_idle(value) {