diff options
| author | Abijeet <abijeetpatro@gmail.com> | 2018-06-16 02:35:29 +0530 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-06-18 07:39:44 +0200 |
| commit | 470310b3bff21ebbc8b994ebba7c9de685f97c44 (patch) | |
| tree | 98cdb22bd4b0cee4192f1e15a38690c6751324a1 | |
| parent | 57b649d665853819a4055f3a3a0ec21f5a1c51f4 (diff) | |
| download | nextcloud-server-470310b3bff21ebbc8b994ebba7c9de685f97c44.tar.gz nextcloud-server-470310b3bff21ebbc8b994ebba7c9de685f97c44.zip | |
Fixes issue with action being displayed incorrectly.
Also fixes the issue with the loading icon on copy & move.
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
| -rw-r--r-- | apps/files/css/files.scss | 4 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 06567332b7d..38c74d242bc 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -480,7 +480,9 @@ a.action > img { display: inline-block; vertical-align: middle; } - +.selectedActions.hidden { + display: none; +} .selectedActions a { display: inline; line-height: 50px; diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index cddedecda78..08c2844a294 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -817,13 +817,13 @@ return false; } - self.fileMultiSelectMenu.toggleLoading('copyMove', true); var disableLoadingState = function(){ self.fileMultiSelectMenu.toggleLoading('copyMove', false); }; var actions = this.isSelectedMovable() ? OC.dialogs.FILEPICKER_TYPE_COPY_MOVE : OC.dialogs.FILEPICKER_TYPE_COPY; OC.dialogs.filepicker(t('files', 'Target folder'), function(targetPath, type) { + self.fileMultiSelectMenu.toggleLoading('copyMove', true); if (type === OC.dialogs.FILEPICKER_TYPE_COPY) { self.copy(files, targetPath, disableLoadingState); } |