web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove the second network created for the drive

Browse Source
This commit is contained in:
yflory
2017-12-05 16:40:04 +01:00
parent 52712c4bb9
commit 17636769e4
11 changed files with 1137 additions and 683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
www/common/cryptpad-common.js
View File

@@ -59,11 +59,6 @@ define([
// RESTRICTED
// Settings only
common.getUserObject = function (cb) {
postMessage("GET", [], function (obj) {
cb(obj);
});
};
common.resetDrive = function (cb) {
postMessage("RESET_DRIVE", null, function (obj) {
if (obj.error) { return void cb(obj.error); }
@@ -81,6 +76,12 @@ define([
cb();
});
};
// Settings and drive
common.getUserObject = function (cb) {
postMessage("GET", [], function (obj) {
cb(obj);
});
};
// Settings and auth
common.getUserObject = function (cb) {
postMessage("GET", [], function (obj) {
@@ -94,6 +95,11 @@ define([
};
postMessage("MIGRATE_ANON_DRIVE", data, cb);
};
// Drive
common.userObjectCommand = function (data, cb) {
postMessage("DRIVE_USEROBJECT", data, cb);
};
common.onDriveLog = Util.mkEvent();
// Profile
common.getProfileEditUrl = function (cb) {
postMessage("GET", ['profile', 'edit'], function (obj) {
@@ -450,6 +456,10 @@ define([
});
};
// Network
common.onNetworkDisconnect = Util.mkEvent();
common.onNetworkReconnect = Util.mkEvent();
// Messenger
var messenger = common.messenger = {};
messenger.getFriendList = function (cb) {
@@ -500,6 +510,10 @@ define([
pad.onLeaveEvent = Util.mkEvent();
pad.onDisconnectEvent = Util.mkEvent();
common.getFullHistory = function (data, cb) {
postMessage("GET_FULL_HISTORY", data, cb);
};
common.getShareHashes = function (secret, cb) {
var hashes;
if (!window.location.hash) {
@@ -591,6 +605,13 @@ define([
common.onFriendComplete(data);
break;
}
// Network
case 'NETWORK_DISCONNECT': {
common.onNetworkDisconnect.fire(); break;
}
case 'NETWORK_RECONNECT': {
common.onNetworkReconnect.fire(data); break;
}
// Messenger
case 'CONTACTS_MESSAGE': {
common.messenger.onMessageEvent.fire(data); break;
@@ -626,6 +647,10 @@ define([
case 'PAD_DISCONNECT': {
common.padRpc.onDisconnectEvent.fire(data); break;
}
// Drive
case 'DRIVE_LOG': {
common.onDriveLog.fire(data);
}
}
};