infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'soon'

pull/1/head
ansuz 2019-09-23 17:54:49 +02:00
parent cfc90a56b6 851f6db7fb
commit e395c0bf1e
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/common/drive-ui.js
View File

@ -3209,6 +3209,11 @@ define([
}
}
if (APP.loggedIn && path[0] === FILES_DATA) {
path = [ROOT];
}
appStatus.ready(false);
currentPath = path;
var s = $content.scrollTop() || 0;

4
www/common/outer/messenger.js
View File

@ -891,10 +891,10 @@ define([
onDirectMessage(ctx, msg, sender);
});
ctx.store.network.on('disconnect', function () {
ctx.emit('DISCONNECT', null, getAllClients());
ctx.emit('DISCONNECT', null, getAllClients(ctx));
});
ctx.store.network.on('reconnect', function () {
ctx.emit('RECONNECT', null, getAllClients());
ctx.emit('RECONNECT', null, getAllClients(ctx));
});
messenger.onFriendUpdate = function (curve) {

10
www/common/outer/team.js
View File

@ -449,6 +449,15 @@ define([
return void cb({error: 'CHAT_INIT_ERROR'});
};
cpNf2 = CpNetflux.start(chatCfg);
}).nThen(function (waitFor) {
roster.metadata({
name: data.name
}, waitFor(function (err) {
if (err) {
waitFor.abort();
return void cb({error: 'ROSTER_INIT_ERROR'});
}
}));
}).nThen(function () {
var lm = Listmap.create(config);
var proxy = lm.proxy;
@ -486,6 +495,7 @@ define([
proxy.drive = {};
onReady(ctx, id, lm, roster, keys, cId, function () {
ctx.updateMetadata();
cb();
});
}).on('error', function (info) {