From 35355283872739fb9bd150cf42a40a1a23b1674d Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Fri, 18 May 2018 21:07:53 +0200
Subject: Support uploading whole folder trees

---
 frontend/index.html | 2 +-
 frontend/js/app.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/index.html b/frontend/index.html
index 5856a16..538d329 100644
--- 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 8970a0f..4cb57e3 100644
--- 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);
-- 
cgit v1.2.3