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

[fileupload] improvement: always full show the popup when upload files; close the popup when navigate away from a 'dir view' page

Browse Source
This commit is contained in:
llj
2017-12-14 17:23:01 +08:00
parent 0ef2a4def0
commit a3600ff488
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
static/scripts/app/views/dir.js
View File

@@ -162,6 +162,7 @@ define([
this.direntDetailsView.hide(); this.direntDetailsView.hide();
this.fileCommentsView.hide(); this.fileCommentsView.hide();
this.fileUploadView.closePopup();
}, },
/***** private functions *****/ /***** private functions *****/

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

@@ -99,10 +99,15 @@ define([
if (dirents.user_perm && dirents.user_perm != 'rw') { if (dirents.user_perm && dirents.user_perm != 'rw') {
return false; return false;
} }
popup.removeClass('hide'); popup.removeClass('hide');
cancel_all_btn.removeClass('hide'); cancel_all_btn.removeClass('hide');
close_icon.addClass('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; var path = dirents.path;
popup.fileupload('option', { popup.fileupload('option', {
'formData': { 'formData': {

2
static/scripts/sysadmin-app/views/dir.js
View File

@@ -113,6 +113,8 @@ define([
hide: function() { hide: function() {
this.$el.detach(); this.$el.detach();
this.attached = false; this.attached = false;
this.fileUploadView.closePopup();
}, },
show: function(repo_id, path) { show: function(repo_id, path) {