Skip to content

Commit cc122e0

Browse files
committed
fix #361: inconsistency with give-answer & give-answer-live-update param
1 parent 6750afd commit cc122e0

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

client/multiplayer/room.jsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ socket.onmessage = function (event) {
7272
case 'error': return handleError(data);
7373
case 'force-username': return forceUsername(data);
7474
case 'give-answer': return giveAnswer(data);
75-
case 'give-answer-live-update': return logGiveAnswer(data, true);
75+
case 'give-answer-live-update': return logGiveAnswer(data);
7676
case 'initiated-vk': return vkInit(data);
7777
case 'join': return join(data);
7878
case 'leave': return leave(data);
@@ -333,7 +333,7 @@ async function giveAnswer ({ celerity, directive, directedPrompt, givenAnswer, p
333333
document.getElementById('answer-input').value = '';
334334
document.getElementById('answer-input-group').classList.add('d-none');
335335
document.getElementById('answer-input').blur();
336-
logGiveAnswer({ directive, message: givenAnswer, username });
336+
logGiveAnswer({ directive, givenAnswer, username });
337337

338338
if (directive === 'prompt' && directedPrompt) {
339339
logEventConditionally(username, `was prompted with "${directedPrompt}"`);
@@ -448,7 +448,7 @@ function logEventConditionally (username, message) {
448448
document.getElementById('room-history').prepend(li);
449449
}
450450

451-
function logGiveAnswer ({ directive = null, message, username }) {
451+
function logGiveAnswer ({ directive = null, givenAnswer, username }) {
452452
const badge = document.createElement('span');
453453
badge.textContent = 'Buzz';
454454
switch (directive) {
@@ -470,7 +470,7 @@ function logGiveAnswer ({ directive = null, message, username }) {
470470
b.textContent = username;
471471

472472
const span = document.createElement('span');
473-
span.textContent = message;
473+
span.textContent = givenAnswer;
474474

475475
let li;
476476
if (document.getElementById('live-buzz')) {
@@ -849,14 +849,14 @@ document.getElementById('answer-form').addEventListener('submit', function (even
849849
});
850850

851851
document.getElementById('answer-input').addEventListener('input', function () {
852-
socket.send(JSON.stringify({ type: 'give-answer-live-update', message: this.value }));
852+
socket.send(JSON.stringify({ type: 'give-answer-live-update', givenAnswer: this.value }));
853853
});
854854

855855
document.getElementById('buzz').addEventListener('click', function () {
856856
this.blur();
857857
if (audio.soundEffects) audio.buzz.play();
858858
socket.send(JSON.stringify({ type: 'buzz' }));
859-
socket.send(JSON.stringify({ type: 'give-answer-live-update', message: '' }));
859+
socket.send(JSON.stringify({ type: 'give-answer-live-update', givenAnswer: '' }));
860860
});
861861

862862
document.getElementById('chat').addEventListener('click', function () {

0 commit comments

Comments
 (0)