Download as
Browse Code »

Commit c38320e495a5f8c54b37d21ed70660fc71e6f331

Authored by Victor Costa
2 parents 4165dcf1 d6464512
Exists in staging and in 4 other branches captcha_serpro_plugin, login-captcha, production, production-vendorized

Merge branch 'rails3_chat' into rails3_stable 

Conflicts:
	public/javascripts/chat.js
Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
public/javascripts/chat.js
  Diff comments   View file @c38320e
... ... @@ -71,7 +71,7 @@ jQuery(function($) {
71 71 },
72 72 insert_or_update_group: function (jid, presence) {
73 73 var jid_id = Jabber.jid_to_id(jid);
74   - var list = $('#buddy-list .room-list');
  74 + var list = $('#buddy-list #rooms .room-list');
75 75 var item = $('#' + jid_id);
76 76 presence = presence || ($(item).length > 0 ? $(item).parent('li').attr('class') : 'offline');
77 77 log('adding or updating contact ' + jid + ' as ' + presence);
... ... @@ -82,7 +82,7 @@ jQuery(function($) {
82 82 },
83 83 insert_or_update_contact: function (jid, name, presence) {
84 84 var jid_id = Jabber.jid_to_id(jid);
85   - var list = $('#buddy-list .buddy-list');
  85 + var list = $('#buddy-list #friends .buddy-list');
86 86 var item = $('#' + jid_id);
87 87 presence = presence || ($(item).length > 0 ? $(item).parent('li').attr('class') : 'offline');
88 88 log('adding or updating contact ' + jid + ' as ' + presence);
... ...