web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'staging' into communities-allow-list

Browse Source
This commit is contained in:
ansuz
2020-02-21 08:40:45 -05:00
parent 791aad53f2 2cceb54aac
commit 42ffb4efb6
12 changed files with 103 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
www/common/outer/async-store.js
View File

@@ -2091,9 +2091,12 @@ define([
store.onlyoffice.removeClient(clientId);
} catch (e) { console.error(e); }
try {
store.mailbox.removeClient(clientId);
if (store.mailbox) {
store.mailbox.removeClient(clientId);
}
} catch (e) { console.error(e); }
Object.keys(store.modules).forEach(function (key) {
if (!store.modules[key]) { return; }
if (!store.modules[key].removeClient) { return; }
try {
store.modules[key].removeClient(clientId);
@@ -2337,7 +2340,6 @@ define([
initAnonRpc(null, null, waitFor());
initRpc(null, null, waitFor());
}).nThen(function (waitFor) {
loadMailbox(waitFor);
Migrate(proxy, waitFor(), function (version, progress) {
postMessage(clientId, 'LOADING_DRIVE', {
state: (2 + (version / 10)),
@@ -2357,6 +2359,7 @@ define([
loadUniversal(Profile, 'profile', waitFor);
loadUniversal(Team, 'team', waitFor);
loadUniversal(History, 'history', waitFor);
loadMailbox(waitFor); // XXX make sure we don't have new issues with mailboxes being loaded later
cleanFriendRequests();
}).nThen(function () {
var requestLogin = function () {