mirror of
https://github.com/cryptpad/cryptpad.git
synced 2026-09-14 11:05:41 +05:00
Merge branch 'staging' into ooapi-dl
This commit is contained in:
commit
b6327a9926
@ -104,6 +104,7 @@ define([
|
||||
msg = JSON.parse(msg);
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
return; // Don't show "undefined" messages
|
||||
}
|
||||
msg.time = time;
|
||||
if (author) { msg.author = author; }
|
||||
@ -232,6 +233,7 @@ define([
|
||||
var anonRpc = Util.find(ctx, [ 'store', 'anon_rpc' ]);
|
||||
if (!mailbox) { return void cb('E_NOT_READY'); }
|
||||
if (!anonRpc) { return void cb("anonymous rpc session not ready"); }
|
||||
if (!data?.ticket) { return void cb('E_NO_DATA'); }
|
||||
var theirPublic, myCurve, notifKey;
|
||||
var time;
|
||||
nThen((waitFor) => {
|
||||
|
||||
@ -162,6 +162,7 @@ define([
|
||||
var makeForm = function (ctx, opts, cb) {
|
||||
let { oldData, recorded, title, hideNotice } = opts || {};
|
||||
var button;
|
||||
cb = Util.once(cb);
|
||||
|
||||
if (typeof(cb) === "function") {
|
||||
button = h('button.btn.btn-primary.cp-support-list-send', Messages.contacts_send);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user