Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions client/play/BonusClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ import addBonusGameCard from './bonuses/add-bonus-game-card.js';
import QuestionClient from './QuestionClient.js';
import { MODE_ENUM } from '../../shared/constants.js';

/**
* @template {typeof QuestionClient} TBase
* @param {TBase} ClientClass
*/
export const BonusClientMixin = (ClientClass) => class extends ClientClass {
constructor (room, userId, socket) {
super(room, userId, socket);
Expand Down
4 changes: 4 additions & 0 deletions client/play/TossupClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ import QuestionClient from './QuestionClient.js';
import audio from './audio.js';
import { MODE_ENUM } from '../../shared/constants.js';

/**
* @template {typeof QuestionClient} TBase
* @param {TBase} ClientClass
*/
export const TossupClientMixin = (ClientClass) => class extends ClientClass {
constructor (room, userId, socket) {
super(room, userId, socket);
Expand Down
12 changes: 6 additions & 6 deletions client/play/bonuses/SoloBonusRoom.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ async function getRandomStarredBonus () {
}

export default class SoloBonusRoom extends BonusRoom {
checkAnswer = api.checkAnswer;
getPacket = getPacket;
getPacketCount = api.getNumPackets;
getRandomBonuses = api.getRandomBonus;
getStarredBonus = getRandomStarredBonus;

constructor (name, categoryManager) {
super(name, categoryManager, ['bonuses']);

this.checkAnswer = api.checkAnswer;
this.getRandomBonuses = api.getRandomBonus;
this.getPacket = getPacket;
this.getStarredBonus = getRandomStarredBonus;
this.getPacketCount = api.getNumPackets;

this.settings = {
...this.settings,
skip: true,
Expand Down
20 changes: 20 additions & 0 deletions client/play/mp/MultiplayerTossupBonusClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ import upsertPlayerItem from '../upsert-player-item.js';
import { setYear } from '../year-slider.js';
import { showAlert } from './alert.js';

/**
* @template {typeof TossupBonusClient} TBase
* @param {TBase} ClientClass
*/
export const MultiplayerClientMixin = (ClientClass) => class extends ClientClass {
constructor (room, userId, socket) {
super(room, userId, socket);
Expand Down Expand Up @@ -117,6 +121,11 @@ export const MultiplayerClientMixin = (ClientClass) => class extends ClientClass
this.sortPlayerListGroup();
}

endCurrentTossup ({ starred, tossup }) {
super.endCurrentTossup({ starred, tossup });
moveChatMessagesToTop();
}

confirmBan ({ targetId, targetUsername }) {
if (targetId === this.USER_ID) {
showAlert('You were banned from this room by the room owner.', () => window.location.replace('../'));
Expand Down Expand Up @@ -282,6 +291,7 @@ export const MultiplayerClientMixin = (ClientClass) => class extends ClientClass

endCurrentBonus ({ bonus, lastPartRevealed, pointsPerPart, starred, teamId }) {
super.endCurrentBonus({ bonus, starred });
moveChatMessagesToTop();
if (lastPartRevealed) {
const points = pointsPerPart.reduce((a, b) => a + b, 0);
this.room.teams[teamId].bonusStats[points]++;
Expand Down Expand Up @@ -433,6 +443,7 @@ export const MultiplayerClientMixin = (ClientClass) => class extends ClientClass
li.appendChild(i);

document.getElementById('room-history').prepend(li);
moveChatMessagesToTop();
}

logGiveAnswer ({ directive = null, givenAnswer, questionType, username }) {
Expand Down Expand Up @@ -490,6 +501,7 @@ export const MultiplayerClientMixin = (ClientClass) => class extends ClientClass
}

if (directive) { li.id = ''; }
moveChatMessagesToTop();
}

lostBuzzerRace ({ username, userId }) {
Expand Down Expand Up @@ -765,6 +777,14 @@ export const MultiplayerClientMixin = (ClientClass) => class extends ClientClass
}
};

function moveChatMessagesToTop () {
const roomHistory = document.getElementById('room-history');
const chatMessages = Array.from(roomHistory.getElementsByClassName('chat-message'));
chatMessages.reverse().forEach(chatMessage => {
roomHistory.prepend(chatMessage);
});
}

function attachEventListeners (room, socket, client) {
document.getElementById('toggle-distraction-free-mode').addEventListener('change', (event) => {
client.distractionFreeMode = event.target.checked;
Expand Down
12 changes: 6 additions & 6 deletions client/play/tossups/SoloTossupRoom.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ async function getPacket ({ setName, packetNumber }) {
}

export default class SoloTossupRoom extends TossupRoom {
checkAnswer = api.checkAnswer;
getPacket = getPacket;
getPacketCount = api.getNumPackets;
getRandomTossups = async (args) => await api.getRandomTossup({ ...args });
getStarredTossup = getStarredTossup;

constructor (name, categoryManager) {
super(name, categoryManager, ['tossups']);

Expand All @@ -38,12 +44,6 @@ export default class SoloTossupRoom extends TossupRoom {
showHistory: true,
typeToAnswer: true
};

this.checkAnswer = api.checkAnswer;
this.getRandomTossups = async (args) => await api.getRandomTossup({ ...args });
this.getPacket = getPacket;
this.getStarredTossup = getStarredTossup;
this.getPacketCount = api.getNumPackets;
}

async message ({ userId, username }, message) {
Expand Down
Loading
Loading