upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fixes issue with action being displayed incorrectly.

Browse source 
Also fixes the issue with the loading icon on copy & move.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
This commit is contained in:
Abijeet 2018-06-16 02:35:29 +05:30 committed by John Molakvoæ (skjnldsv)
parent 57b649d665
commit 470310b3bf
No known key found for this signature in database
GPG key ID: 60C25B8C072916CF
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files/css/files.scss
View file

@ -480,7 +480,9 @@ a.action > img {
display: inline-block;
vertical-align: middle;
}
.selectedActions.hidden {
display: none;
}
.selectedActions a {
display: inline;
line-height: 50px;

2
apps/files/js/filelist.js
View file

@ -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);
}