From 3e53e437523701549dd254a1b5510dd1181a8420 Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 28 Aug 2019 16:53:18 +0200 Subject: [PATCH 1/2] Fix drive export from settings and exported folder name --- www/common/make-backup.js | 11 ++++++----- www/drive/inner.js | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/www/common/make-backup.js b/www/common/make-backup.js index 214532e7c..382aee0b3 100644 --- a/www/common/make-backup.js +++ b/www/common/make-backup.js @@ -3,10 +3,11 @@ define([ '/file/file-crypto.js', '/common/common-hash.js', '/common/common-util.js', + '/customize/messages.js', '/bower_components/nthen/index.js', '/bower_components/saferphore/index.js', '/bower_components/jszip/dist/jszip.min.js', -], function (Crypt, FileCrypto, Hash, Util, nThen, Saferphore, JsZip) { +], function (Crypt, FileCrypto, Hash, Util, Messages, nThen, Saferphore, JsZip) { var saveAs = window.saveAs; var sanitize = function (str) { @@ -273,7 +274,7 @@ define([ fileHost: fileHost, get: getPad, data: data.uo.drive, - folder: data.folder || ctx.data.root, + folder: data.folder, sf: data.sf, zip: new JsZip(), errors: [], @@ -286,8 +287,8 @@ define([ progress('reading', -1); nThen(function (waitFor) { ctx.waitFor = waitFor; - var zipRoot = ctx.zip.folder('Root'); - makeFolder(ctx, ctx.folder, zipRoot, filesData); + var zipRoot = ctx.zip.folder(data.name || Messages.fm_rootName); + makeFolder(ctx, ctx.folder || ctx.data.root, zipRoot, filesData); progress('download', {}); }).nThen(function () { console.log(ctx.zip); @@ -311,7 +312,7 @@ define([ var _downloadFolder = function (ctx, data, cb, updateProgress) { create(data, ctx.get, ctx.fileHost, function (blob, errors) { - console.error(errors); // TODO show user errors + if (errors && errors.length) { console.error(errors); } // TODO show user errors var dl = function () { saveAs(blob, data.folderName); }; diff --git a/www/drive/inner.js b/www/drive/inner.js index 987eeb16d..fbdaaa7a0 100644 --- a/www/drive/inner.js +++ b/www/drive/inner.js @@ -3745,6 +3745,7 @@ define([ var todo = function (data) { data.folder = folderElement; data.sharedFolderId = sfId; + data.name = Util.fixFileName(folderName); data.folderName = Util.fixFileName(folderName) + '.zip'; APP.FM.downloadFolder(data, function (err, obj) { From 166ab65cd47a64e020528089244ed5be34f6e3c8 Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 29 Aug 2019 13:22:06 +0200 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17849a7ef..f781e10d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,8 +40,9 @@ During this development period we performed an extensive audit of our existing f * it's now possible to export files and folders (as zips) directly from your CryptDrive * the ctrl-e and right-click menus in the drive now features an entry for uploading files and folders * certain plain-text file formats uploaded as static files can now be rendered within other documents or used as the basis of a new code pad - * regular folders in your CryptDrive can be converted into shared folders from the right-click menu as long as they do not contain shared folders and are not within another shared folder + * ~~regular folders in your CryptDrive can be converted into shared folders from the right-click menu as long as they do not contain shared folders and are not within another shared folder~~ * nesting is complicated for a variety of technical reasons, but we're discussing whether it's worthwhile to try to find a solution + * we found a critical bug in the implementation of this feature and disabled it for this release * documents and folders within your CryptDrive can now be moved to parent folders by dropping them on the file path in the toolbar * Styles * the upload/download progress table has been restyled to be less invasive