lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

properly handle certain characters in active meetings

This commit is contained in:
Josh 2017-07-21 11:59:51 -04:00
parent 3bc31048f4
commit 23815ca118
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/active_meetings.js
View File

@ -71,8 +71,9 @@ var updateMeetingText = function(m){
} }
// If the item doesn't exist, add it and set up join meeting event. // If the item doesn't exist, add it and set up join meeting event.
if($('#' + m['name'].replace(' ', '_')).length == 0){ if($("li[id='" + m['name'].replace(' ', '_') + "']").length == 0){
var meeting_item = $('<li id = ' + m['name'].replace(' ', '_') + '>' + body + '</li>') var meeting_item = $("<li>" + body + "</li>")
meeting_item.attr('id', m['name'].replace(' ', '_'))
$('.actives').append(meeting_item); $('.actives').append(meeting_item);
// Set up join on click. // Set up join on click.
@ -81,7 +82,7 @@ var updateMeetingText = function(m){
}); });
// Otherwise, just change the body. // Otherwise, just change the body.
} else { } else {
$('#' + m['name'].replace(' ', '_')).html(body) $("li[id='" + m['name'].replace(' ', '_') + "']").html(body)
} }
} }
@ -153,7 +154,7 @@ var isPreviouslyJoined = function(meeting){
// Removes an active meeting. // Removes an active meeting.
var removeActiveMeeting = function(meeting){ var removeActiveMeeting = function(meeting){
if(meeting){ $('#' + meeting['name'].replace(' ', '_')).remove() } if(meeting){ $("li[id='" + meeting['name'].replace(' ', '_') + "']").remove() }
} }
// Directly join a meeting from active meetings. // Directly join a meeting from active meetings.
@ -192,7 +193,7 @@ $(document).on('turbolinks:load', function(){
App.messages = App.cable.subscriptions.create('RefreshMeetingsChannel', { App.messages = App.cable.subscriptions.create('RefreshMeetingsChannel', {
received: function(data) { received: function(data) {
console.log('Recieved ' + data['method'] + ' action for ' + data['meeting'] + ' with room id ' + data['room'] + '.') console.log('Recieved ' + data['method'] + ' action for ' + data['meeting'] + ' with room id ' + data['room'] + '.')
if(isPreviouslyJoined(data['meeting']) && data['room'] == $('body').data('current-user')){ if(data['room'] == $('body').data('current-user')){
// Handle webhook event. // Handle webhook event.
if(data['method'] == 'create'){ if(data['method'] == 'create'){
// Create an empty meeting. // Create an empty meeting.