Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
ansuz 4 years ago
commit e697ccfd58

@ -1732,13 +1732,11 @@ define([
postMessage(clientId, "PAD_CACHE"); postMessage(clientId, "PAD_CACHE");
}, },
onCacheReady: function () { onCacheReady: function () {
channel.hasCache = true;
postMessage(clientId, "PAD_CACHE_READY"); postMessage(clientId, "PAD_CACHE_READY");
}, },
onReady: function (pad) { onReady: function (pad) {
var padData = pad.metadata || {}; var padData = pad.metadata || {};
channel.data = padData; channel.data = padData;
channel.ready = true;
if (padData && padData.validateKey && store.messenger) { if (padData && padData.validateKey && store.messenger) {
store.messenger.storeValidateKey(data.channel, padData.validateKey); store.messenger.storeValidateKey(data.channel, padData.validateKey);
} }

@ -187,7 +187,7 @@ define([
team.rpc = call; team.rpc = call;
team.onRpcReadyEvt.fire(); team.onRpcReadyEvt.fire();
cb(); cb();
}); }, Cache);
}); });
}; };

Loading…
Cancel
Save