haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-16 15:19:06 +00:00
Code Issues Releases Wiki Activity

Merge branch '6.0'

Browse Source 
Conflicts:
	media/css/seahub.css
This commit is contained in:
zhengxie
2016-12-26 14:22:35 +08:00
parent f5d17c3814 c28f684c22
commit d4e00402af
39 changed files with 520 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
static/scripts/app/views/fileupload.js
View File

@@ -128,13 +128,16 @@ define([
data.files.shift();
return;
}
if (file.webkitRelativePath) {
file.relative_path = file.webkitRelativePath;
}
// add folder by drag & drop
if (file.relativePath) {
file.relative_path = file.relativePath + file.name;
// set 'file.relative_path' when upload a folder
if (data.fileInput) { // clicking
if (file.webkitRelativePath) {
file.relative_path = file.webkitRelativePath;
}
} else { // drag & drop
if (file.relativePath) {
file.relative_path = file.relativePath + file.name;
}
}
})
.bind('fileuploadstart', function() {