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

pull/1/head
ClemDee 5 years ago
commit e8c98200ec

@ -1188,9 +1188,6 @@ define([
onLeave: function (m) {
channel.bcast("PAD_LEAVE", m);
},
onAbort: function () {
channel.bcast("PAD_DISCONNECT");
},
onError: function (err) {
channel.bcast("PAD_ERROR", err);
delete channels[data.channel];
@ -1199,7 +1196,11 @@ define([
channel.bcast("PAD_ERROR", err);
delete channels[data.channel];
},
onConnectionChange: function () {},
onConnectionChange: function (info) {
if (!info.state) {
channel.bcast("PAD_DISCONNECT");
}
},
crypto: {
// The encryption and decryption is done in the outer window.
// This async-store only deals with already encrypted messages.

@ -575,7 +575,6 @@ MessengerUI, Messages) {
};
var createRequest = function (toolbar, config) {
console.error('test');
if (!config.metadataMgr) {
throw new Error("You must provide a `metadataMgr` to display the request access button");
}

Loading…
Cancel
Save