|
|
@ -169,7 +169,7 @@ define([
|
|
|
|
isReady: true,
|
|
|
|
isReady: true,
|
|
|
|
_onReady: [],
|
|
|
|
_onReady: [],
|
|
|
|
onReady: function (handler) {
|
|
|
|
onReady: function (handler) {
|
|
|
|
if (isReady) {
|
|
|
|
if (appStatus.isReady) {
|
|
|
|
handler();
|
|
|
|
handler();
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -186,9 +186,6 @@ define([
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
var isReady = false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var removeSelected = function () {
|
|
|
|
var removeSelected = function () {
|
|
|
|
$iframe.find('.selected').removeClass("selected");
|
|
|
|
$iframe.find('.selected').removeClass("selected");
|
|
|
|
};
|
|
|
|
};
|
|
|
@ -1376,6 +1373,7 @@ define([
|
|
|
|
readOnly: false,
|
|
|
|
readOnly: false,
|
|
|
|
validateKey: secret.keys.validateKey || undefined,
|
|
|
|
validateKey: secret.keys.validateKey || undefined,
|
|
|
|
crypto: Crypto.createEncryptor(secret.keys),
|
|
|
|
crypto: Crypto.createEncryptor(secret.keys),
|
|
|
|
|
|
|
|
//logging: true
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
var rt = window.rt = module.rt = Listmap.create(listmapConfig);
|
|
|
|
var rt = window.rt = module.rt = Listmap.create(listmapConfig);
|
|
|
@ -1383,7 +1381,7 @@ define([
|
|
|
|
var realtime = module.realtime = info.realtime;
|
|
|
|
var realtime = module.realtime = info.realtime;
|
|
|
|
|
|
|
|
|
|
|
|
var editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
|
|
|
|
var editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
|
|
|
|
if (!window.location.hash) {
|
|
|
|
if (!window.location.hash || !localStorage.FS_hash) {
|
|
|
|
localStorage.FS_hash = editHash;
|
|
|
|
localStorage.FS_hash = editHash;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|