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

Use global router to open chat rooms

Browse Source
This commit is contained in:
JC Brand 2017-10-31 22:08:06 +01:00
parent 35db952e71
commit 985cf6c294
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/converse-muc.js
View File

@ -355,20 +355,19 @@
}); });
_converse.api.promises.add(['roomsPanelRendered', 'roomsAutoJoined']); _converse.api.promises.add(['roomsPanelRendered', 'roomsAutoJoined']);
const MUCRouter = Backbone.Router.extend({
routes: { function openRoom (room) {
'converse?room=:room': 'openRoom' const promises = [_converse.api.waitUntil('roomsAutoJoined')]
}, if (!_converse.allow_bookmarks) {
openRoom (room) { promises.push( _converse.api.waitUntil('bookmarksInitialized'));
// FIXME: also need to wait for bookmarks
_converse.api.waitUntil('roomsAutoJoined').then(() => {
if (utils.isValidJID(room)) {
_converse.api.rooms.open(room);
}
});
} }
}); Promise.all(promises).then(() => {
const router = new MUCRouter(); if (utils.isValidJID(room)) {
_converse.api.rooms.open(room);
}
});
}
_converse.router.route('converse/room?jid=:room', openRoom);
function openChatRoom (settings, bring_to_foreground) { function openChatRoom (settings, bring_to_foreground) {
@ -2744,8 +2743,6 @@
Strophe.LogLevel.ERROR); Strophe.LogLevel.ERROR);
} }
}); });
// XXX: Could return Promise for api.rooms.open and then wait
// until all promises have resolved before emitting this.
_converse.emit('roomsAutoJoined'); _converse.emit('roomsAutoJoined');
} }
_converse.on('chatBoxesFetched', autoJoinRooms); _converse.on('chatBoxesFetched', autoJoinRooms);