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

temp

Browse Source
This commit is contained in:
yflory
2018-07-10 15:10:07 +02:00
parent 4b86ed2dec
commit 66a494cbd2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
www/common/mergeDrive.js
View File

@@ -106,7 +106,7 @@ define([
var proxy = proxyData.proxy; var proxy = proxyData.proxy;
var oldFo = FO.init(parsed.drive, { var oldFo = FO.init(parsed.drive, {
loggedIn: proxyData.loggedIn, loggedIn: proxyData.loggedIn,
pinPads: function () {} // without pinPads /outer/userObject.js won't be loaded outer: true
}); });
var onMigrated = function () { var onMigrated = function () {
oldFo.fixFiles(true); oldFo.fixFiles(true);
@@ -141,6 +141,7 @@ define([
// Add the file data in our array and use the id to add the file // Add the file data in our array and use the id to add the file
var data = oldFo.getFileData(id); var data = oldFo.getFileData(id);
if (data) { if (data) {
// XXX
newFo.pushData(data, function (err, id) { newFo.pushData(data, function (err, id) {
if (err) { return void console.error("Cannot import file:", data, err); } if (err) { return void console.error("Cannot import file:", data, err); }
createFromPath(proxy, oldFo, paths[0], id); createFromPath(proxy, oldFo, paths[0], id);