Merge branch 'soon' into staging

pull/1/head
yflory 8 years ago
commit 75c3c10b20

@ -296,7 +296,7 @@ define([
.on('change', ['drive', 'migrate'], function () { .on('change', ['drive', 'migrate'], function () {
var path = arguments[2]; var path = arguments[2];
var value = arguments[1]; var value = arguments[1];
if (path[0] === 'drive' && path[1] === "migrate" && value == 1) { if (path[0] === 'drive' && path[1] === "migrate" && value === 1) {
rt.network.disconnect(); rt.network.disconnect();
rt.realtime.abort(); rt.realtime.abort();
Cryptpad.alert(Cryptpad.Messages.fs_migration, null, true); Cryptpad.alert(Cryptpad.Messages.fs_migration, null, true);

Loading…
Cancel
Save