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

Export folder is now working in drive

Browse Source
This commit is contained in:
ClemDee
2019-08-14 17:27:37 +02:00
parent 51241bda48
commit a0d85c6e34
3 changed files with 59 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
www/drive/inner.js
View File

@@ -3597,19 +3597,16 @@ define([
};
var downloadFolder = function (folderElement, folderName) {
console.warn("downloadFolder");
var downloadFolder = function (folderElement, folderName, sfId) {
var todo = function (data) {
data.folder = folderElement;
folderName = Util.fixFileName(folderName) + '.zip';
console.log("data", data);
console.log("folderName", folderName);
data.sharedFolderId = sfId;
data.folderName = Util.fixFileName(folderName) + '.zip';
Backup.create(data, common.getPad, function (blob, errors) {
console.log("blob", blob);
window.saveAs(blob, folderName);
console.error(errors);
}, function () {});
APP.FM.downloadFolder(data, function (err, obj) {
console.log(err, obj);
console.log('DONE');
});
};
todo({
uo: proxy,
@@ -3711,29 +3708,21 @@ define([
if (paths.length !== 1) { return; }
var path = paths[0];
el = manager.find(path.path);
console.log("el", el);
console.log('path', path);
// folder
if (manager.isFolder(el)) {
// folder
var name, folderEl;
if (!manager.isSharedFolder(el)) {
console.log("--isFolder--");
name = path.path[path.path.length - 1];
console.log('name', name);
folderEl = el;
downloadFolder(folderEl, name);
}
// shared folder
else {
console.log("--isSharedFolder--");
data = manager.getSharedFolderData(el);
name = data.title;
folderEl = manager.find(path.path.concat("root"));
console.log("folderEl", folderEl);
console.log("data:", data);
console.log('name', name);
downloadFolder(folderEl, name);
downloadFolder(folderEl, name, el);
}
}
// file