Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions src/view/pane/room.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,11 @@ Candy.View.Pane = (function(self, $) {
* candy:view.room.after-hide using {roomJid, element}
*/
show: function(roomJid) {
var roomId = self.Chat.rooms[roomJid].id,
evtData;
var roomId = self.Chat.rooms[roomJid].id;
var roomObject = Candy.Core.getRoom(roomJid);

$('.room-pane').each(function() {
var elem = $(this);
evtData = {
'roomJid': elem.attr('data-roomjid'),
'element' : elem
};

if(elem.attr('id') === ('chat-room-' + roomId)) {
elem.show();
Expand All @@ -142,22 +138,19 @@ Candy.View.Pane = (function(self, $) {
* After showing a room
*
* Parameters:
* (String) roomJid - Room JID
* (jQuery.Element) element - Room element
* (String) room - Room object
*/
$(Candy).triggerHandler('candy:view.room.after-show', evtData);

$(Candy).triggerHandler('candy:view.room.after-show', { room: roomObject});
} else {
elem.hide();

/** Event: candy:view.room.after-hide
* After hiding a room
*
* Parameters:
* (String) roomJid - Room JID
* (jQuery.Element) element - Room element
* (String) room - Room object
*/
$(Candy).triggerHandler('candy:view.room.after-hide', evtData);
$(Candy).triggerHandler('candy:view.room.after-hide', { room: roomObject});
}
});
},
Expand Down