diff --git a/js/app.js b/js/app.js index 69a01fcf80..4823166232 100644 --- a/js/app.js +++ b/js/app.js @@ -65,6 +65,9 @@ /** @property {OCA.Talk.Signaling.base} signaling */ signaling: null, + /** property {String} selector */ + mainCallElementSelector: '#app-content', + /** @property {OCA.SpreedMe.Models.RoomCollection} _rooms */ _rooms: null, /** @property {OCA.SpreedMe.Views.RoomListView} _roomsView */ diff --git a/js/connection.js b/js/connection.js index 765b99d07a..ad3fb1cf4f 100644 --- a/js/connection.js +++ b/js/connection.js @@ -103,7 +103,7 @@ if (!OCA.Talk.PublicShareAuth) { OC.Util.History.pushState({}, OC.generateUrl('/apps/spreed')); } - $('#app-content, #talk-sidebar').removeClass('incall'); + $(this.app.mainCallElementSelector).removeClass('incall'); roomsChannel.trigger('leaveCurrentRoom'); }, @@ -132,7 +132,7 @@ leaveCurrentCall: function() { this.app.signaling.leaveCurrentCall(); this.app.signaling.syncRooms(); - $('#app-content, #talk-sidebar').removeClass('incall'); + $(this.app.mainCallElementSelector).removeClass('incall'); }, }; diff --git a/js/publicshareauth.js b/js/publicshareauth.js index a15852fdd9..0e460261c4 100644 --- a/js/publicshareauth.js +++ b/js/publicshareauth.js @@ -76,6 +76,8 @@ '
' + '
'); + OCA.SpreedMe.app.mainCallElementSelector = '#talk-sidebar'; + OCA.SpreedMe.app._emptyContentView.destroy(); OCA.SpreedMe.app._emptyContentView = new OCA.SpreedMe.Views.EmptyContentView({ el: '#talk-sidebar > #emptycontent' diff --git a/js/webrtc.js b/js/webrtc.js index 4534fe42bf..af9f061628 100644 --- a/js/webrtc.js +++ b/js/webrtc.js @@ -24,7 +24,7 @@ var spreedPeerConnectionTable = []; currentUsersNo = 1; } - var $appContentElement = $('#app-content, #talk-sidebar'), + var $appContentElement = $(OCA.SpreedMe.app.mainCallElementSelector), participantsClass = 'participants-' + currentUsersNo, hadScreensharing = $appContentElement.hasClass('screensharing'), hadSidebar = $appContentElement.hasClass('with-app-sidebar'); @@ -1157,7 +1157,7 @@ var spreedPeerConnectionTable = []; // Check if there are still some screens if (!document.getElementById('screens').hasChildNodes()) { screenSharingActive = false; - $('#app-content, #talk-sidebar').removeClass('screensharing'); + $(OCA.SpreedMe.app.mainCallElementSelector).removeClass('screensharing'); if (unpromotedSpeakerId) { OCA.SpreedMe.speakers.switchVideoToId(unpromotedSpeakerId); unpromotedSpeakerId = null; @@ -1183,7 +1183,7 @@ var spreedPeerConnectionTable = []; OCA.SpreedMe.speakers.unpromoteLatestSpeaker(); screenSharingActive = true; - $('#app-content, #talk-sidebar').addClass('screensharing'); + $(OCA.SpreedMe.app.mainCallElementSelector).addClass('screensharing'); var screens = document.getElementById('screens'); if (screens) {