haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 07:01:12 +00:00
Code Issues Releases Wiki Activity

Merge branch '6.2'

Browse Source 
Conflicts:
	seahub/templates/base.html
	static/scripts/app/views/dir.js
	static/scripts/common.js
This commit is contained in:
zhengxie
2017-12-28 15:47:18 +08:00
parent a6fe949ebc 1d613f070b
commit d37144ef75
98 changed files with 35519 additions and 30010 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,10 +99,15 @@ define([
if (dirents.user_perm && dirents.user_perm != 'rw') {
return false;
}
popup.removeClass('hide');
cancel_all_btn.removeClass('hide');
close_icon.addClass('hide');
// in case the popup was folded.
popup.height(parseInt(_this.popup_height));
$('.fileupload-buttonbar, table', popup).removeClass('hide');
var path = dirents.path;
popup.fileupload('option', {
'formData': {