|
@@ -85,7 +85,7 @@ var ContactList = {
|
85
|
85
|
ensureAddContact: function (peerJid, id) {
|
86
|
86
|
var resourceJid = Strophe.getResourceFromJid(peerJid);
|
87
|
87
|
|
88
|
|
- var contact = $('#contactlist>ul>li[id="' + resourceJid + '"]');
|
|
88
|
+ var contact = $('#contacts>li[id="' + resourceJid + '"]');
|
89
|
89
|
|
90
|
90
|
if (!contact || contact.length <= 0)
|
91
|
91
|
ContactList.addContact(peerJid, id);
|
|
@@ -100,7 +100,7 @@ var ContactList = {
|
100
|
100
|
addContact: function (peerJid, id) {
|
101
|
101
|
var resourceJid = Strophe.getResourceFromJid(peerJid);
|
102
|
102
|
|
103
|
|
- var contactlist = $('#contactlist>ul');
|
|
103
|
+ var contactlist = $('#contacts');
|
104
|
104
|
|
105
|
105
|
var newContact = document.createElement('li');
|
106
|
106
|
newContact.id = resourceJid;
|
|
@@ -114,15 +114,11 @@ var ContactList = {
|
114
|
114
|
newContact.appendChild(createAvatar(id));
|
115
|
115
|
newContact.appendChild(createDisplayNameParagraph("participant"));
|
116
|
116
|
|
117
|
|
- var clElement = contactlist.get(0);
|
118
|
|
-
|
119
|
|
- if (resourceJid === APP.xmpp.myResource()
|
120
|
|
- && $('#contactlist>ul .title')[0].nextSibling.nextSibling) {
|
121
|
|
- clElement.insertBefore(newContact,
|
122
|
|
- $('#contactlist>ul .title')[0].nextSibling.nextSibling);
|
|
117
|
+ if (resourceJid === APP.xmpp.myResource()) {
|
|
118
|
+ contactlist.prepend(newContact);
|
123
|
119
|
}
|
124
|
120
|
else {
|
125
|
|
- clElement.appendChild(newContact);
|
|
121
|
+ contactlist.append(newContact);
|
126
|
122
|
}
|
127
|
123
|
updateNumberOfParticipants(1);
|
128
|
124
|
},
|
|
@@ -135,7 +131,7 @@ var ContactList = {
|
135
|
131
|
removeContact: function (peerJid) {
|
136
|
132
|
var resourceJid = Strophe.getResourceFromJid(peerJid);
|
137
|
133
|
|
138
|
|
- var contact = $('#contactlist>ul>li[id="' + resourceJid + '"]');
|
|
134
|
+ var contact = $('#contacts>li[id="' + resourceJid + '"]');
|
139
|
135
|
|
140
|
136
|
if (contact && contact.length > 0) {
|
141
|
137
|
var contactlist = $('#contactlist>ul');
|
|
@@ -165,7 +161,7 @@ var ContactList = {
|
165
|
161
|
},
|
166
|
162
|
|
167
|
163
|
setClickable: function (resourceJid, isClickable) {
|
168
|
|
- var contact = $('#contactlist>ul>li[id="' + resourceJid + '"]');
|
|
164
|
+ var contact = $('#contacts>li[id="' + resourceJid + '"]');
|
169
|
165
|
if (isClickable) {
|
170
|
166
|
contact.addClass('clickable');
|
171
|
167
|
} else {
|
|
@@ -179,7 +175,7 @@ var ContactList = {
|
179
|
175
|
|
180
|
176
|
var resourceJid = Strophe.getResourceFromJid(peerJid);
|
181
|
177
|
|
182
|
|
- var contactName = $('#contactlist #' + resourceJid + '>p');
|
|
178
|
+ var contactName = $('#contacts #' + resourceJid + '>p');
|
183
|
179
|
|
184
|
180
|
if (contactName && displayName && displayName.length > 0)
|
185
|
181
|
contactName.html(displayName);
|