зеркало из https://github.com/nextcloud/spreed.git
Sync and set active room when joined only in Application
"syncAndSetActiveRoom" in Embedded only synchronized the rooms after joining a room, but that is already done in PublicShareAuth and the Files plugin (followed by some specific code for each case once the synchronization is done). Due to this calling "syncAndSetActiveRoom" after joining a room is only needed in Application. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
Родитель
731345e100
Коммит
3d499857ce
|
@ -618,6 +618,8 @@
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.syncAndSetActiveRoom(token);
|
||||||
|
|
||||||
this.inRoom = true;
|
this.inRoom = true;
|
||||||
if (this.pendingNickChange) {
|
if (this.pendingNickChange) {
|
||||||
this.setGuestName(this.pendingNickChange);
|
this.setGuestName(this.pendingNickChange);
|
||||||
|
|
|
@ -19,12 +19,6 @@
|
||||||
selectParticipants.removeClass('error');
|
selectParticipants.removeClass('error');
|
||||||
});
|
});
|
||||||
|
|
||||||
this.app.signaling.on('joinRoom', function(joinedToken) {
|
|
||||||
if (joinedToken === this.app.token) {
|
|
||||||
this.app.syncAndSetActiveRoom(joinedToken);
|
|
||||||
}
|
|
||||||
}.bind(this));
|
|
||||||
|
|
||||||
this.app.signaling.on('roomChanged', function() {
|
this.app.signaling.on('roomChanged', function() {
|
||||||
this.leaveCurrentRoom();
|
this.leaveCurrentRoom();
|
||||||
}.bind(this));
|
}.bind(this));
|
||||||
|
|
|
@ -64,10 +64,6 @@
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
syncAndSetActiveRoom: function(token) {
|
|
||||||
this.signaling.syncRooms();
|
|
||||||
},
|
|
||||||
|
|
||||||
initialize: function() {
|
initialize: function() {
|
||||||
if (!OC.getCurrentUser().uid) {
|
if (!OC.getCurrentUser().uid) {
|
||||||
this.initGuestName();
|
this.initGuestName();
|
||||||
|
|
Загрузка…
Ссылка в новой задаче