Commit fa2ff46c authored by JC Brand's avatar JC Brand

Give chatroom's occupants view a ref to the chatroom view

and thereby fix bug with directInvites.
parent 450ce04f
...@@ -2133,7 +2133,7 @@ ...@@ -2133,7 +2133,7 @@
__("You may optionally include a message, explaining the reason for the invitation.") __("You may optionally include a message, explaining the reason for the invitation.")
); );
if (reason !== null) { if (reason !== null) {
converse.connection.muc.rooms[this.model.get('id')].directInvite(suggestion.jid, reason); converse.connection.muc.rooms[this.chatroomview.model.get('id')].directInvite(suggestion.jid, reason);
converse.emit('roomInviteSent', this, suggestion.jid, reason); converse.emit('roomInviteSent', this, suggestion.jid, reason);
} }
$(ev.target).typeahead('val', ''); $(ev.target).typeahead('val', '');
...@@ -2180,8 +2180,9 @@ ...@@ -2180,8 +2180,9 @@
this); this);
this.occupantsview = new converse.ChatRoomOccupantsView({ this.occupantsview = new converse.ChatRoomOccupantsView({
model: new converse.ChatRoomOccupants({nick: this.model.get('nick')}) model: new converse.ChatRoomOccupants({nick: this.model.get('nick')}),
}); });
this.occupantsview.chatroomview = this;
this.render(); this.render();
this.occupantsview.model.fetch({add:true}); this.occupantsview.model.fetch({add:true});
this.connect(null); this.connect(null);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment