roomslist: Less confusing code by using promises

This commit is contained in:
JC Brand 2017-07-05 11:40:54 +02:00
parent 5ab1693136
commit 6e67bdfdb5

View File

@ -163,13 +163,16 @@
{'model': _converse.chatboxes} {'model': _converse.chatboxes}
); );
}; };
_converse.on('bookmarksInitialized', initRoomsListView);
_converse.on('roomsPanelRendered', function () { $.when(_converse.api.waitUntil('chatBoxesFetched'),
if (_converse.allow_bookmarks) { _converse.api.waitUntil('roomsPanelRendered')).then(
return; function () {
} if (_converse.allow_bookmarks) {
initRoomsListView(); _converse.api.waitUntil('bookmarksInitialized').then(initRoomsListView);
}); } else {
initRoomsListView();
}
});
var afterReconnection = function () { var afterReconnection = function () {
if (_.isUndefined(_converse.rooms_list_view)) { if (_.isUndefined(_converse.rooms_list_view)) {