Move the 'logged out' screen inside the sframe

This commit is contained in:
yflory
2017-11-13 17:28:09 +01:00
parent 5a2afb5c95
commit 1514ad5df3
9 changed files with 49 additions and 29 deletions

View File

@@ -101,6 +101,7 @@ define([
secret.channel = Utils.Hash.createChannelId();
}
Cryptpad.getShareHashes(secret, waitFor(function (err, h) { hashes = h; }));
}).nThen(function () {
var readOnly = secret.keys && !secret.keys.editKeyStr;
if (!secret.keys) { secret.keys = secret.key; }
@@ -161,6 +162,10 @@ define([
sframeChan.onReg('EV_METADATA_UPDATE', updateMeta);
proxy.on('change', 'settings', updateMeta);
Cryptpad.onLogout(function () {
sframeChan.event('EV_LOGOUT');
});
Cryptpad.onError(function (info) {
console.log('error');
console.log(info);