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

Leave the channel when a shared folder is removed from a drive

Browse Source
This commit is contained in:
yflory
2019-10-28 18:41:00 +01:00
parent 176e667128
commit b6d44b2a1a
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
www/common/proxy-manager.js
View File

@@ -49,7 +49,6 @@ define([
return userObject;
};
// XXX: Remove a shared folder from the list
var removeProxy = function (Env, id) {
var f = Env.folders[id];
if (!f) { return; }
@@ -63,11 +62,13 @@ define([
// In a read-only team, we can't deprecate a shared folder
// Use a empty object with a deprecated flag...
var lm = { proxy: { deprecated: true } };
removeProxy(Env, id);
addProxy(Env, id, lm, function () {});
return void Env.Store.refreshDriveUI();
}
if (channel) { Env.unpinPads([channel], function () {}); }
Env.user.userObject.deprecateSharedFolder(id);
removeProxy(Env, id);
if (Env.Store && Env.Store.refreshDriveUI) {
Env.Store.refreshDriveUI();
}
@@ -1065,10 +1066,13 @@ define([
settings: data.settings,
user: {
proxy: proxy,
userObject: UserObject.init(proxy, uoConfig)
},
folders: {}
};
uoConfig.removeProxy = function (id) {
removeProxy(Env, id);
};
Env.user.userObject = UserObject.init(proxy, uoConfig);
var callWithEnv = function (f) {
return function () {