Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit
This commit is contained in:
commit
8a818d250f
1 changed files with 0 additions and 6 deletions
|
@ -36,10 +36,6 @@ export default class MultiInviter {
|
||||||
* Invite users to this room. This may only be called once per
|
* Invite users to this room. This may only be called once per
|
||||||
* instance of the class.
|
* instance of the class.
|
||||||
*
|
*
|
||||||
* The promise is given progress when each address completes, with an
|
|
||||||
* object argument with each completed address with value either
|
|
||||||
* 'invited' or 'error'.
|
|
||||||
*
|
|
||||||
* @param {array} addresses Array of addresses to invite
|
* @param {array} addresses Array of addresses to invite
|
||||||
* @returns {Promise} Resolved when all invitations in the queue are complete
|
* @returns {Promise} Resolved when all invitations in the queue are complete
|
||||||
*/
|
*/
|
||||||
|
@ -111,7 +107,6 @@ export default class MultiInviter {
|
||||||
if (this._canceled) { return; }
|
if (this._canceled) { return; }
|
||||||
|
|
||||||
this.completionStates[addr] = 'invited';
|
this.completionStates[addr] = 'invited';
|
||||||
this.deferred.notify(this.completionStates);
|
|
||||||
|
|
||||||
this._inviteMore(nextIndex + 1);
|
this._inviteMore(nextIndex + 1);
|
||||||
}, (err) => {
|
}, (err) => {
|
||||||
|
@ -136,7 +131,6 @@ export default class MultiInviter {
|
||||||
this.busy = !fatal;
|
this.busy = !fatal;
|
||||||
|
|
||||||
if (!fatal) {
|
if (!fatal) {
|
||||||
this.deferred.notify(this.completionStates);
|
|
||||||
this._inviteMore(nextIndex + 1);
|
this._inviteMore(nextIndex + 1);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue