mirror of https://github.com/xwiki-labs/cryptpad
Fix reconnect
This commit is contained in:
parent
9c5ad795e1
commit
953d98be96
|
@ -556,8 +556,8 @@ define([
|
|||
|
||||
// Pad RPC
|
||||
var pad = common.padRpc = {};
|
||||
pad.joinPad = function (data, cb) {
|
||||
postMessage("JOIN_PAD", data, cb);
|
||||
pad.joinPad = function (data) {
|
||||
postMessage("JOIN_PAD", data);
|
||||
};
|
||||
pad.sendPadMsg = function (data, cb) {
|
||||
postMessage("SEND_PAD_MSG", data, cb);
|
||||
|
@ -567,6 +567,7 @@ define([
|
|||
pad.onJoinEvent = Util.mkEvent();
|
||||
pad.onLeaveEvent = Util.mkEvent();
|
||||
pad.onDisconnectEvent = Util.mkEvent();
|
||||
pad.onConnectEvent = Util.mkEvent();
|
||||
pad.onErrorEvent = Util.mkEvent();
|
||||
|
||||
// Loading events
|
||||
|
@ -680,6 +681,7 @@ define([
|
|||
PAD_JOIN: common.padRpc.onJoinEvent.fire,
|
||||
PAD_LEAVE: common.padRpc.onLeaveEvent.fire,
|
||||
PAD_DISCONNECT: common.padRpc.onDisconnectEvent.fire,
|
||||
PAD_CONNECT: common.padRpc.onConnectEvent.fire,
|
||||
PAD_ERROR: common.padRpc.onErrorEvent.fire,
|
||||
// Drive
|
||||
DRIVE_LOG: common.drive.onLog.fire,
|
||||
|
|
|
@ -966,7 +966,7 @@ define([
|
|||
channel.queue.forEach(function (data) {
|
||||
sendMessage(data.message);
|
||||
});
|
||||
cb({
|
||||
postMessage("PAD_CONNECT", {
|
||||
myID: wc.myID,
|
||||
id: wc.id,
|
||||
members: wc.members
|
||||
|
|
|
@ -24,7 +24,7 @@ define([
|
|||
var txid = mkTxid();
|
||||
var timeout = setTimeout(function () {
|
||||
delete queries[txid];
|
||||
console.log("Timeout making query " + q);
|
||||
//console.log("Timeout making query " + q);
|
||||
}, 30000);
|
||||
queries[txid] = function (data, msg) {
|
||||
clearTimeout(timeout);
|
||||
|
|
|
@ -116,6 +116,10 @@ define([], function () {
|
|||
sframeChan.event('EV_RT_DISCONNECT');
|
||||
});
|
||||
|
||||
padRpc.onConnectEvent.reg(function (data) {
|
||||
onOpen(data);
|
||||
});
|
||||
|
||||
padRpc.onErrorEvent.reg(function (err) {
|
||||
sframeChan.event('EV_RT_ERROR', err);
|
||||
});
|
||||
|
@ -128,8 +132,6 @@ define([], function () {
|
|||
owners: owners,
|
||||
password: password,
|
||||
expire: expire
|
||||
}, function(data) {
|
||||
onOpen(data);
|
||||
});
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue