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

Migrated pads were not displayed instantly in the drive

Browse Source
This commit is contained in:
yflory 2017-06-19 11:52:57 +02:00
parent 928dadcf77
commit e40f43bd20
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/common/mergeDrive.js
View File

@ -105,7 +105,7 @@ define([
var oldFo = FO.init(parsed.drive, {
Cryptpad: Cryptpad
});
var todo = function () {
var onMigrated = function () {
oldFo.fixFiles();
var newData = Cryptpad.getStore().getProxy();
var newFo = newData.fo;
@ -151,8 +151,10 @@ define([
proxy.FS_hashes = [];
}
proxy.FS_hashes.push(localStorage.FS_hash);
if (typeof(cb) === "function") { cb(); }
};
oldFo.migrate(todo);
oldFo.migrate(onMigrated);
return;
}
if (typeof(cb) === "function") { cb(); }
};

2
www/drive/main.js
View File

@ -2561,8 +2561,8 @@ define([
filesOp.pushData(data, function (e, id) {
if (e) { return void console.error("Error while creating the default pad:", e); } // TODO LIMIT?
filesOp.add(id);
if (typeof(cb) === "function") { cb(); }
});
if (typeof(cb) === "function") { cb(); }
});
delete sessionStorage.createReadme;
return;