haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-10-20 10:20:42 +00:00
Code Issues Releases Wiki Activity

Merge branch '6.3'

Browse Source
This commit is contained in:
zhengxie
2019-01-19 15:38:33 +08:00
parent 3627b13dcb 0104f29ff1
commit d772dba34b
12 changed files with 211 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
static/scripts/app/views/dirent-details.js
View File

@@ -49,9 +49,6 @@ define([
if (part_data.error_msg) {
$('.error', $container).html(part_data.error_msg).show();
} else {
this.$('.dir-folder-counts').html(part_data.dir_count);
this.$('.dir-file-counts').html(part_data.file_count);
this.$('.dir-size').html(part_data.size);
$('table', $container).show();
}
},

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

@@ -192,7 +192,7 @@ define([
data.jqXHR = popup.fileupload('send', data);
} else {
var block_size = 1024 * 1024;
var block_size = app.pageOptions.resumable_upload_file_block_size * 1024 * 1024;
if (enable_resumable_fileupload &&
file.size && file.size > block_size) {
popup.fileupload('option', 'maxChunkSize', block_size);