roomslist: Less confusing code by using promises

6e67bdfd · JC Brand · 5ab16931 · 6e67bdfd
Commit 6e67bdfd authored Jul 05, 2017 by JC Brand
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 7 deletions

src/converse-roomslist.js src/converse-roomslist.js +10 -7

No files found.
--- a/src/converse-roomslist.js
+++ b/src/converse-roomslist.js
@@ -163,13 +163,16 @@
                    {'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 () {
                if (_.isUndefined(_converse.rooms_list_view)) {