Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Don't store ChatRoomOccupants on ChatRoomView

Browse Source 
Helps with enforcing discipline of keeping them separate
This commit is contained in:
JC Brand 2019-05-15 15:55:45 +02:00
parent 7cd69726a8
commit ceb9d12957
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spec/muc.js
View File

@ -1432,8 +1432,8 @@
await test_utils.openAndEnterChatRoom(_converse, 'lounge', 'localhost', 'dummy');
var name;
var view = _converse.chatboxviews.get('lounge@localhost'),
occupants = view.el.querySelector('.occupant-list');
const view = _converse.chatboxviews.get('lounge@localhost');
const occupants = view.el.querySelector('.occupant-list');
var presence, role, jid, model;
for (var i=0; i<mock.chatroom_names.length; i++) {
name = mock.chatroom_names[i];
@ -1452,8 +1452,8 @@
.c('status').attrs({code:'110'}).nodeTree;
_converse.connection._dataRecv(test_utils.createRequest(presence));
expect(occupants.querySelectorAll('li').length).toBe(2+i);
model = view.occupantsview.model.where({'nick': name})[0];
var index = view.occupantsview.model.indexOf(model);
model = view.model.occupants.where({'nick': name})[0];
const index = view.model.occupants.indexOf(model);
expect(occupants.querySelectorAll('li .occupant-nick')[index].textContent.trim()).toBe(mock.chatroom_names[i]);
}
@ -1506,8 +1506,8 @@
.c('status').attrs({code:'110'}).nodeTree;
_converse.connection._dataRecv(test_utils.createRequest(presence));
expect(occupants.querySelectorAll('li').length).toBe(2+i);
model = view.occupantsview.model.where({'nick': name})[0];
var index = view.occupantsview.model.indexOf(model);
model = view.model.occupants.where({'nick': name})[0];
const index = view.model.occupants.indexOf(model);
expect(occupants.querySelectorAll('li .occupant-nick')[index].textContent.trim()).toBe(mock.chatroom_names[i]);
}
@ -1801,8 +1801,7 @@
spyOn(_converse.connection, 'send').and.callFake(function (stanza) {
sent_stanza = stanza;
});
const results_el = view.occupantsview.el.querySelector('.suggestion-box__results');
const hint = results_el.firstElementChild;
const hint = await test_utils.waitUntil(() => view.el.querySelector('.suggestion-box__results li'));
expect(input.value).toBe('Felix');
expect(hint.textContent).toBe('Felix Amsel');

4
src/converse-muc-views.js
View File

@ -637,9 +637,9 @@ converse.plugins.add('converse-muc-views', {
createOccupantsView () {
this.model.occupants.chatroomview = this;
this.occupantsview = new _converse.ChatRoomOccupantsView({'model': this.model.occupants});
const view = new _converse.ChatRoomOccupantsView({'model': this.model.occupants});
const container_el = this.el.querySelector('.chatroom-body');
container_el.insertAdjacentElement('beforeend', this.occupantsview.el);
container_el.insertAdjacentElement('beforeend', view.el);
},
initMentionAutoComplete () {