diff --git a/app/assets/javascripts/channels/meeting_updates.js b/app/assets/javascripts/channels/meeting_updates.js index 7b8c7382..481ca175 100644 --- a/app/assets/javascripts/channels/meeting_updates.js +++ b/app/assets/javascripts/channels/meeting_updates.js @@ -3,14 +3,14 @@ var sessionStatusRefresh = function(url) { $.get(url + "/session_status_refresh", function(html) { $(".center-panel-wrapper").html(html); - displayMeetingURL(); + displayRoomURL(); }); } var initRooms = function() { App.messages = App.cable.subscriptions.create({ channel: 'MeetingUpdatesChannel', - encrypted_id: getEncryptedId() + encrypted_id: Meeting.getInstance().getId() }, { received: function(data) { diff --git a/app/assets/javascripts/channels/recording_update.js b/app/assets/javascripts/channels/recording_update.js index ad75f6c7..51c9d842 100644 --- a/app/assets/javascripts/channels/recording_update.js +++ b/app/assets/javascripts/channels/recording_update.js @@ -3,7 +3,7 @@ var initRooms = function() { App.messages = App.cable.subscriptions.create({ channel: 'RecordingUpdatesChannel', - encrypted_id: getEncryptedId() + encrypted_id: Meeting.getInstance().getId() }, { received: function(data) { diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js index 24aa8725..a718cb74 100644 --- a/app/assets/javascripts/landing.js +++ b/app/assets/javascripts/landing.js @@ -16,11 +16,9 @@ var init = function() { $('.center-panel-wrapper').on ('click', '.meeting-join', function (event) { - var url = $('.meeting-url').val(); var name = $('.meeting-user-name').val(); - Meeting.getInstance().setURL(url); Meeting.getInstance().setName(name); - var jqxhr = Meeting.getInstance().getjoinMeetingURL(); + var jqxhr = Meeting.getInstance().getJoinMeetingResponse(); jqxhr.done(function(data) { if (data.messageKey === 'wait_for_moderator') { @@ -47,10 +45,10 @@ }); $('.center-panel-wrapper').on ('click', '.meeting-url-copy', function (event) { - meetingURL = $('.meeting-url'); - meetingURL.select(); + meetingURLInput = $('.meeting-url'); + meetingURLInput.select(); document.execCommand("copy"); - meetingURL.blur(); + meetingURLInput.blur(); }); // enable popovers @@ -94,7 +92,7 @@ }; var initRooms = function() { - displayMeetingURL(); + displayRoomURL(); // initialize recordings datatable recordingsTable = $('#recordings').dataTable({ @@ -147,7 +145,7 @@ targets: -1, render: function(data, type, row) { if (type === 'display') { - var roomName = getEncryptedId(); + var roomName = Meeting.getInstance().getId(); var published = row.published; var eye = getPublishClass(published); return '