Commit 2f968f70 authored by JC Brand's avatar JC Brand

More optimizations.

Don't sort the global ContactRosters collection (we only need to sort the
individual groups).
Only add the roster to the DOM once the users have been added.
parent 3d32bfef
...@@ -3356,13 +3356,13 @@ ...@@ -3356,13 +3356,13 @@
this.RosterContacts = Backbone.Collection.extend({ this.RosterContacts = Backbone.Collection.extend({
model: converse.RosterContact, model: converse.RosterContact,
comparator: function (contact1, contact2) { comparator: function (contact1, contact2) {
var name1 = contact1.get('fullname').toLowerCase(); var name1, name2;
var status1 = contact1.get('chat_status') || 'offline'; var status1 = contact1.get('chat_status') || 'offline';
var name2 = contact2.get('fullname').toLowerCase();
var status2 = contact2.get('chat_status') || 'offline'; var status2 = contact2.get('chat_status') || 'offline';
if (STATUS_WEIGHTS[status1] === STATUS_WEIGHTS[status2]) { if (STATUS_WEIGHTS[status1] === STATUS_WEIGHTS[status2]) {
name1 = contact1.get('fullname').toLowerCase();
name2 = contact2.get('fullname').toLowerCase();
return name1 < name2 ? -1 : (name1 > name2? 1 : 0); return name1 < name2 ? -1 : (name1 > name2? 1 : 0);
} else { } else {
return STATUS_WEIGHTS[status1] < STATUS_WEIGHTS[status2] ? -1 : 1; return STATUS_WEIGHTS[status1] < STATUS_WEIGHTS[status2] ? -1 : 1;
...@@ -3503,7 +3503,7 @@ ...@@ -3503,7 +3503,7 @@
groups: item.groups, groups: item.groups,
jid: item.jid, jid: item.jid,
subscription: item.subscription subscription: item.subscription
}); }, {sort: false});
} else { } else {
if ((item.subscription === 'none') && (item.ask === null)) { if ((item.subscription === 'none') && (item.ask === null)) {
// This user is no longer in our roster // This user is no longer in our roster
...@@ -3849,6 +3849,7 @@ ...@@ -3849,6 +3849,7 @@
converse.roster.on("remove", this.update, this); converse.roster.on("remove", this.update, this);
this.model.on("add", this.onGroupAdd, this); this.model.on("add", this.onGroupAdd, this);
this.model.on("reset", this.reset, this); this.model.on("reset", this.reset, this);
this.$roster = $('<dl class="roster-contacts"></dl>');
}, },
update: _.debounce(function () { update: _.debounce(function () {
...@@ -3857,6 +3858,9 @@ ...@@ -3857,6 +3858,9 @@
if (!$count.is(':visible')) { if (!$count.is(':visible')) {
$count.show(); $count.show();
} }
if (this.$roster.parent().length === 0) {
this.$el.append(this.$roster);
}
return this.showHideFilter(); return this.showHideFilter();
}, 300), }, 300),
...@@ -3942,7 +3946,7 @@ ...@@ -3942,7 +3946,7 @@
// Don't hide if user is currently filtering. // Don't hide if user is currently filtering.
return; return;
} }
if (this.$('.roster-contacts').hasScrollBar()) { if (this.$roster.hasScrollBar()) {
if (!visible) { if (!visible) {
$filter.show(); $filter.show();
$type.show(); $type.show();
...@@ -4047,7 +4051,7 @@ ...@@ -4047,7 +4051,7 @@
this.add(group.get('name'), view.render()); this.add(group.get('name'), view.render());
} }
if (idx === 0) { if (idx === 0) {
this.$('.roster-contacts').append(view.$el); this.$roster.append(view.$el);
} else { } else {
this.appendGroup(view); this.appendGroup(view);
} }
...@@ -4060,7 +4064,7 @@ ...@@ -4060,7 +4064,7 @@
*/ */
var index = this.model.indexOf(view.model); var index = this.model.indexOf(view.model);
if (index === 0) { if (index === 0) {
this.$('.roster-contacts').prepend(view.$el); this.$roster.prepend(view.$el);
} else if (index == (this.model.length-1)) { } else if (index == (this.model.length-1)) {
this.appendGroup(view); this.appendGroup(view);
} else { } else {
......
...@@ -3,4 +3,3 @@ ...@@ -3,4 +3,3 @@
<option value="contacts">{{label_contacts}}</option> <option value="contacts">{{label_contacts}}</option>
<option value="groups">{{label_groups}}</option> <option value="groups">{{label_groups}}</option>
</select> </select>
<dl class="roster-contacts"></dl>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment