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

Let the RosterView render and populate itself

Browse Source 
instead of having the ControlBoxView do it. This provides for cleaner
separation between the two plugins.
This commit is contained in:
JC Brand 2016-09-21 11:48:28 +02:00
parent 7030495275
commit d8d1c283a7
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/converse-controlbox.js
View File

@ -216,7 +216,7 @@
this.model.on('change:closed', this.ensureClosedState, this);
this.render();
if (this.model.get('connected')) {
this.initRoster();
this.insertRoster();
}
if (typeof this.model.get('closed')==='undefined') {
this.model.set('closed', !converse.show_controlbox_by_default);
@ -252,20 +252,14 @@
onConnected: function () {
if (this.model.get('connected')) {
this.render().initRoster();
this.render().insertRoster();
}
},
initRoster: function () {
/* We initialize the roster, which will appear inside the
* Contacts Panel.
insertRoster: function () {
/* Place the rosterview inside the "Contacts" panel.
*/
converse.rosterview = new converse.RosterView({model: converse.rostergroups});
this.contactspanel.$el.append(converse.rosterview.$el);
converse.rosterview.render().populate().then(function () {
converse.rosterview.update();
converse.sendInitialPresence();
});
return this;
},

14
src/converse-rosterview.js
View File

@ -31,6 +31,20 @@
this.__super__.afterReconnected.apply(this, arguments);
},
initRoster: function () {
/* Create an instance of RosterView once the RosterGroups
* collection has been created (in converse-core.js)
*/
this.__super__.initRoster.apply(this, arguments);
converse.rosterview = new converse.RosterView({
'model': converse.rostergroups
});
converse.rosterview.render().populate().then(function () {
converse.rosterview.update();
converse.sendInitialPresence();
});
},
RosterGroups: {
comparator: function () {
// RosterGroupsComparator only gets set later (once i18n is