Support uploading whole folder trees

diff --git a/frontend/index.html b/frontend/index.html
index 5856a1615587ef9397fe72095d968eab299abac6..538d32932afdc3edd077ece1900c24bd2c3ee447 100644 (file)
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -21,7 +21,7 @@
 <div id="app" @drop="drop" @dragover="dragOver">
 
 <el-container>
-  <input type="file" ref="upload" style="display: none" id="uploadInput" multiple/>
+  <input type="file" ref="upload" style="display: none" id="uploadInput" multiple  webkitdirectory="" directory=""/>
 
   <el-dialog title="Login" :visible.sync="ready && !session.valid" width="30%" :close-on-press-escape="false" :show-close="false">
     <el-form :model="loginData" label-position="top" @submit.native.prevent>

diff --git a/frontend/js/app.js b/frontend/js/app.js
index 8970a0f8b6c3d379fa6fba545bbcc51cfdac931d..4cb57e3b1b35163d1c72c04cd5e07e78d08d75ff 100644 (file)
--- a/frontend/js/app.js
+++ b/frontend/js/app.js
@@ -136,7 +136,7 @@ function uploadFiles(files) {
     app.uploadStatus.percentDone = 0;
 
     asyncForEach(files, function (file, callback) {
-        var path = encode(sanitize(app.path + '/' + file.name));
+        var path = encode(sanitize(app.path + '/' + (file.webkitRelativePath || file.name)));
 
         var formData = new FormData();
         formData.append('file', file);