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

Merge branch 'staging' into newDrive

Browse Source
This commit is contained in:
yflory
2017-06-09 14:40:26 +02:00
parent 78e6118153 7f120c8fc1
commit 9ca10ba524
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
www/common/fsStore.js
View File

@@ -297,19 +297,15 @@ define([
return;
}
})
.on('change', [], function () {
.on('change', ['drive', 'migrate'], function () {
var path = arguments[2];
var value = arguments[1];
console.log('abcd');
console.log(arguments);
if (path[0] === 'drive' && path[1] === "migrate" && value === 1) {
console.log('PEWPEWPEW');
if (path[0] === 'drive' && path[1] === "migrate" && value == 1) {
rt.network.disconnect();
rt.realtime.abort();
Cryptpad.alert("Disconnected while migration");
Cryptpad.alert(Cryptpad.Messages.fs_migration);
}
});
};
Store.ready = function (f, Cryptpad) {