Merge branch 'duplicateText2' into staging

2020-03-26 16:23:12 +01:00
parent e15196bd53 d69ad7c0e6
commit c7688b7c8c
4 changed files with 17 additions and 8 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -879,7 +879,8 @@ define([
        postMessage("LEAVE_PAD", data, cb);
    };
    pad.sendPadMsg = function (data, cb) {
-        postMessage("SEND_PAD_MSG", data, cb);
+        // -1 ==> no timeout, we may receive the callback only when we reconnect
+        postMessage("SEND_PAD_MSG", data, cb, { timeout: -1 });
    };
    pad.onReadyEvent = Util.mkEvent();
    pad.onMessageEvent = Util.mkEvent();