dani/vroom
1
0
Fork 0
mirror of https://github.com/dani/vroom.git synced 2024-06-01 21:11:41 +02:00
Code Issues Projects Releases Wiki Activity

Escape text chat in newChatMessage()

Browse Source
This commit is contained in:
Daniel Berteaud 2014-05-06 18:39:57 +02:00
parent 0d77ea55fe
commit 9dd070b02a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/js/vroom.js
View File

@ -246,9 +246,9 @@ function initVroom(room) {
// Add a new message to the chat history
function newChatMessage(from,message){
// displayName and message have already been escaped
// displayName has already been escaped
var cl = (from === 'local') ? 'chatMsgSelf':'chatMsgOthers';
var newmsg = $('<div class="chatMsg ' + cl + '">' + getTime() + ' ' + peers[from].displayName + '<p>' + linkify(message) + '</p></div>').css('background-color', peers[from].color);
var newmsg = $('<div class="chatMsg ' + cl + '">' + getTime() + ' ' + peers[from].displayName + '<p>' + linkify(stringEscape(message)) + '</p></div>').css('background-color', peers[from].color);
$('<div class="row chatMsgContainer"></div>').append(newmsg).appendTo('#chatHistory');
$('#chatHistory').scrollTop($('#chatHistory').prop('scrollHeight'));
}
@ -299,7 +299,7 @@ function initVroom(room) {
$('#chatDropdown').addClass('btn-danger');
playSound('newmsg.mp3');
}
newChatMessage(peer.id,stringEscape(data.payload));
newChatMessage(peer.id,data.payload);
}
});
@ -618,7 +618,7 @@ function initVroom(room) {
if ($('#chatBox').val()) {
webrtc.sendDirectlyToAll('vroom', 'textChat', $('#chatBox').val());
// Local echo of our own message
newChatMessage('local',stringEscape($('#chatBox').val()));
newChatMessage('local',$('#chatBox').val());
// reset the input box
$('#chatBox').val('').prop('rows', 1);
}