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

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

Browse Source
This commit is contained in:
ClemDee 2019-08-14 10:44:50 +02:00
commit f627837cd1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -773,7 +773,7 @@ define([
waitFor.abort(); waitFor.abort();
return void cb(obj); return void cb(obj);
} }
}), true); }));
common.unpinPads([oldChannel], waitFor()); common.unpinPads([oldChannel], waitFor());
common.pinPads([newSecret.channel], waitFor()); common.pinPads([newSecret.channel], waitFor());
}).nThen(function (waitFor) { }).nThen(function (waitFor) {

7
www/common/outer/async-store.js
View File

@ -244,7 +244,7 @@ define([
// data.force tells us we can safely remove the drive ID // data.force tells us we can safely remove the drive ID
var channel = data; var channel = data;
var force = false; var force = false;
if (typeof(data) === "object") { if (data && typeof(data) === "object") {
channel = data.channel; channel = data.channel;
force = data.force; force = data.force;
} }
@ -587,7 +587,10 @@ define([
})); }));
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
// Delete Drive // Delete Drive
Store.removeOwnedChannel(clientId, secret.channel, waitFor()); Store.removeOwnedChannel(clientId, {
channel: secret.channel,
force: true
}, waitFor());
}).nThen(function () { }).nThen(function () {
store.network.disconnect(); store.network.disconnect();
cb({ cb({