From 4ebed3c9954b87c98087e9e8c6cf94b3ae6dd7d6 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Mon, 29 Feb 2016 20:04:47 +0000 Subject: [PATCH] We still need the roster in core, so set it there. Still have to move the roster code out of src/converse-controlbox.js --- src/converse-controlbox.js | 3 --- src/converse-core.js | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/converse-controlbox.js b/src/converse-controlbox.js index 9fa59230c..c186eb1e0 100644 --- a/src/converse-controlbox.js +++ b/src/converse-controlbox.js @@ -265,9 +265,6 @@ /* We initialize the roster, which will appear inside the * Contacts Panel. */ - converse.roster = new converse.RosterContacts(); - converse.roster.browserStorage = new Backbone.BrowserStorage[converse.storage]( - b64_sha1('converse.contacts-'+converse.bare_jid)); var rostergroups = new converse.RosterGroups(); rostergroups.browserStorage = new Backbone.BrowserStorage[converse.storage]( b64_sha1('converse.roster.groups'+converse.bare_jid)); diff --git a/src/converse-core.js b/src/converse-core.js index b70ec733f..3ede458c8 100755 --- a/src/converse-core.js +++ b/src/converse-core.js @@ -822,6 +822,9 @@ this.enableCarbons(); this.initStatus(function () { this.registerIntervalHandler(); + this.roster = new this.RosterContacts(); + this.roster.browserStorage = new Backbone.BrowserStorage[this.storage]( + b64_sha1('converse.contacts-'+this.bare_jid)); this.chatboxes.onConnected(); this.giveFeedback(__('Contacts')); if (typeof this.callback === 'function') {