|
@@ -550,16 +550,7 @@
|
|
|
|
|
|
this.model.occupants.on('add', this.showJoinNotification, this);
|
|
|
this.model.occupants.on('remove', this.showLeaveNotification, this);
|
|
|
- this.model.occupants.on('change:show', (occupant) => {
|
|
|
- if (!occupant.isMember() || _.includes(occupant.get('states'), '303')) {
|
|
|
- return;
|
|
|
- }
|
|
|
- if (occupant.get('show') === 'offline') {
|
|
|
- this.showLeaveNotification(occupant);
|
|
|
- } else if (occupant.get('show') === 'online') {
|
|
|
- this.showJoinNotification(occupant);
|
|
|
- }
|
|
|
- });
|
|
|
+ this.model.occupants.on('change:show', this.showJoinOrLeaveNotification, this);
|
|
|
|
|
|
this.createEmojiPicker();
|
|
|
this.createOccupantsView();
|
|
@@ -1383,6 +1374,17 @@
|
|
|
}
|
|
|
},
|
|
|
|
|
|
+ showJoinOrLeaveNotification (occupant) {
|
|
|
+ if (!occupant.isMember() || _.includes(occupant.get('states'), '303')) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (occupant.get('show') === 'offline') {
|
|
|
+ this.showLeaveNotification(occupant);
|
|
|
+ } else if (occupant.get('show') === 'online') {
|
|
|
+ this.showJoinNotification(occupant);
|
|
|
+ }
|
|
|
+ },
|
|
|
+
|
|
|
showJoinNotification (occupant) {
|
|
|
if (this.model.get('connection_status') !== converse.ROOMSTATUS.ENTERED) {
|
|
|
return;
|