Browse Source

Make possible to customize the element that gets the "incall" CSS class

This is a temporal hack, as the proper change would be to move the
modification of elements out of Connection and WebRTC, but for the time
being it will make possible to prevent those objects from modifying
"#app-content" when video calls are added to the details view of Files
app.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
pull/1312/head
Daniel Calviño Sánchez 7 years ago
parent
commit
268d91cb97
  1. 3
      js/app.js
  2. 4
      js/connection.js
  3. 2
      js/publicshareauth.js
  4. 6
      js/webrtc.js

3
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 */

4
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');
},
};

2
js/publicshareauth.js

@ -76,6 +76,8 @@
'<div class="nameIndicator">' +
'</div>');
OCA.SpreedMe.app.mainCallElementSelector = '#talk-sidebar';
OCA.SpreedMe.app._emptyContentView.destroy();
OCA.SpreedMe.app._emptyContentView = new OCA.SpreedMe.Views.EmptyContentView({
el: '#talk-sidebar > #emptycontent'

6
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) {

Loading…
Cancel
Save