diff --git a/chat_client/static/css/chat.css b/chat_client/static/css/chat.css index 53aa0ec4..8a0f3052 100644 --- a/chat_client/static/css/chat.css +++ b/chat_client/static/css/chat.css @@ -31,6 +31,8 @@ body{ line-height: 50px; user-select: none; font-size: 13px; + white-space: nowrap; + overflow: hidden; } diff --git a/chat_client/static/js/builder_utils.js b/chat_client/static/js/builder_utils.js index b5c97c86..d6921074 100644 --- a/chat_client/static/js/builder_utils.js +++ b/chat_client/static/js/builder_utils.js @@ -132,7 +132,7 @@ async function buildUserMessageHTML(userData, cid, messageID, messageText, timeC */ const shrinkNickname = (nick) => { const index = nick.indexOf('_'); - return (index !== -1 && index < 8) ? nick.substring(0, index) : nick.substring(0, 8); + return (index !== -1 && index < 7) ? nick.substring(0, index) : nick.substring(0, 7); } /** @@ -195,12 +195,16 @@ async function buildSubmindHTML(promptID, submindID, submindUserData, submindRes * Gets winner field HTML based on provided winner * @return {string} built winner field HTML * @param nickname of the winner + * @param winner_response */ -async function buildPromptWinnerHTML(nickname) { +async function buildPromptWinnerHTML(nickname, winner_response) { return `
- Selected winner + Selected winner ${await buildPromptParticipantIcon(nickname)} +
+ ${winner_response} +
` } @@ -278,7 +282,10 @@ async function buildPromptHTML(prompt) { }); if (promptData['winner'] === submindUserData['nickname']) { winnerFound = true; - promptData['winner'] = await buildPromptWinnerHTML(submindUserData['nickname']); + promptData['winner'] = await buildPromptWinnerHTML( + submindUserData['nickname'], + data.proposed_responses['message_text'] + ); } submindsHTML += await buildSubmindHTML(prompt['_id'], submindID, submindUserData, data.proposed_responses, data.submind_opinions, data.votes); diff --git a/chat_client/static/js/chat_utils.js b/chat_client/static/js/chat_utils.js index 780d7b82..1051a5cb 100644 --- a/chat_client/static/js/chat_utils.js +++ b/chat_client/static/js/chat_utils.js @@ -295,7 +295,7 @@ async function buildConversation(conversationData, skin, remember=true,conversat const textInputElem = document.getElementById(conversationData['_id'] + '-input'); if (chatInputButton.hasAttribute('data-target-cid')) { textInputElem.addEventListener('keyup', async (e)=>{ - if (e.shiftKey && e.key === 'Enter'){ + if (e.key === 'Enter' && !e.shiftKey){ await sendMessage(textInputElem, conversationData['_id']); } });