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

Recreate promises whenever initialize is called.

Browse Source
This commit is contained in:
JC Brand 2017-07-11 15:22:05 +02:00
parent 6ef0536e31
commit e75b6ad694
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/converse-core.js
View File

@ -34,8 +34,8 @@
// Strophe globals
const { $build, $iq, $msg, $pres } = Strophe;
const { b64_sha1 } = Strophe.SHA1;
({ Strophe } = Strophe);
const b64_sha1 = Strophe.SHA1.b64_sha1;
Strophe = Strophe.Strophe;
// Use Mustache style syntax for variable interpolation
/* Configuration of Lodash templates (this config is distinct to the
@ -51,33 +51,9 @@
'templates': {},
'promises': {}
}
_.extend(_converse, Backbone.Events);
const PROMISES = [
'cachedRoster',
'chatBoxesFetched',
'connected',
'pluginsInitialized',
'roster',
'rosterContactsFetched',
'rosterGroupsFetched',
'rosterInitialized',
'statusInitialized'
];
function addPromise (promise) {
_converse.promises[promise] = utils.getWrappedPromise();
}
_.each(PROMISES, addPromise);
_converse.emit = function (name) {
_converse.trigger.apply(this, arguments);
const promise = _converse.promises[name];
if (!_.isUndefined(promise)) {
promise.resolve();
}
};
_converse.core_plugins = [
'converse-bookmarks',
'converse-chatview',
@ -173,11 +149,41 @@
}
};
const PROMISES = [
'cachedRoster',
'chatBoxesFetched',
'connected',
'pluginsInitialized',
'roster',
'rosterContactsFetched',
'rosterGroupsFetched',
'rosterInitialized',
'statusInitialized'
];
function addPromise (promise) {
/* Private function, used to add a new promise to the ones already
* available via the `waitUntil` api method.
*/
_converse.promises[promise] = utils.getWrappedPromise();
}
_converse.emit = function (name) {
/* Event emitter and promise resolver */
_converse.trigger.apply(this, arguments);
const promise = _converse.promises[name];
if (!_.isUndefined(promise)) {
promise.resolve();
}
};
_converse.initialize = function (settings, callback) {
"use strict";
settings = !_.isUndefined(settings) ? settings : {};
const init_promise = utils.getWrappedPromise();
_.each(PROMISES, addPromise);
if (!_.isUndefined(_converse.chatboxes)) {
// Looks like _converse.initialized was called again without logging
// out or disconnecting in the previous session.