aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js/files.js
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-11-08 19:03:32 +0100
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-11-08 19:03:32 +0100
commit584272962a0971d1025c1577f578985d0de7ec83 (patch)
tree8c7b653af95ce6f8dd55c63927504a5fc147a17e /apps/files/js/files.js
parentb001060556e93ba4c1e1f7aff48390a7612e0b56 (diff)
downloadnextcloud-server-584272962a0971d1025c1577f578985d0de7ec83.tar.gz
nextcloud-server-584272962a0971d1025c1577f578985d0de7ec83.zip
Improve drag & drop and fix some background issue if d&d on narrow windows
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'apps/files/js/files.js')
-rw-r--r--apps/files/js/files.js18
1 files changed, 11 insertions, 7 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index e34d7fe2550..017bf7ecf41 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -117,32 +117,32 @@
ownerDisplayName = $('#ownerDisplayName').val();
if (usedSpacePercent > 98) {
if (owner !== oc_current_user) {
- OC.Notification.show(t('files', 'Storage of {owner} is full, files can not be updated or synced anymore!',
+ OC.Notification.show(t('files', 'Storage of {owner} is full, files can not be updated or synced anymore!',
{owner: ownerDisplayName}), {type: 'error'}
);
return;
}
- OC.Notification.show(t('files',
- 'Your storage is full, files can not be updated or synced anymore!'),
+ OC.Notification.show(t('files',
+ 'Your storage is full, files can not be updated or synced anymore!'),
{type : 'error'}
);
return;
}
if (usedSpacePercent > 90) {
if (owner !== oc_current_user) {
- OC.Notification.show(t('files', 'Storage of {owner} is almost full ({usedSpacePercent}%)',
+ OC.Notification.show(t('files', 'Storage of {owner} is almost full ({usedSpacePercent}%)',
{
- usedSpacePercent: usedSpacePercent,
+ usedSpacePercent: usedSpacePercent,
owner: ownerDisplayName
}),
- {
+ {
type: 'error'
}
);
return;
}
OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%)',
- {usedSpacePercent: usedSpacePercent}),
+ {usedSpacePercent: usedSpacePercent}),
{type : 'error'}
);
}
@@ -396,6 +396,8 @@ var dragOptions={
}
$selectedFiles.closest('tr').addClass('animate-opacity dragging');
$selectedFiles.closest('tr').filter('.ui-droppable').droppable( 'disable' );
+ // Show breadcrumbs menu
+ $('.crumbmenu').addClass('canDropChildren');
},
stop: function(event, ui) {
@@ -411,6 +413,8 @@ var dragOptions={
setTimeout(function() {
$tr.removeClass('animate-opacity');
}, 300);
+ // Hide breadcrumbs menu
+ $('.crumbmenu').removeClass('canDropChildren');
},
drag: function(event, ui) {
var scrollingArea = FileList.$container;