aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Weimann <mail@michael-weimann.eu>2018-12-29 11:53:10 +0100
committerJulius Härtl <jus@bitgrid.net>2019-01-04 11:28:11 +0100
commit2f0cd40c50fac778c45ac2c00f887876273ee836 (patch)
tree0c45405e0a328e4c795a37b1efebe9df3756efa2
parent07b00cf27580e54bc31e2e56a1b70cdaec32cc79 (diff)
downloadnextcloud-server-2f0cd40c50fac778c45ac2c00f887876273ee836.tar.gz
nextcloud-server-2f0cd40c50fac778c45ac2c00f887876273ee836.zip
Add the file drop uploaded files element
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
-rw-r--r--apps/files_sharing/js/files_drop.js4
-rw-r--r--apps/files_sharing/templates/public.php1
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/files_sharing/js/files_drop.js b/apps/files_sharing/js/files_drop.js
index 69465f791df..340f941a718 100644
--- a/apps/files_sharing/js/files_drop.js
+++ b/apps/files_sharing/js/files_drop.js
@@ -61,7 +61,7 @@
$('#drop-upload-done-indicator').addClass('hidden');
$('#drop-upload-progress-indicator').removeClass('hidden');
- $('#public-upload ul').append(output({isUploading: true, name: data.files[0].name}));
+ $('#drop-uploaded-files').append(output({isUploading: true, name: data.files[0].name}));
$('[data-toggle="tooltip"]').tooltip();
data.submit();
@@ -69,7 +69,7 @@
},
updateFileItem: function (fileName, fileItem) {
- $('#public-upload ul li[data-name="' + fileName + '"]').replaceWith(fileItem);
+ $('#drop-uploaded-files li[data-name="' + fileName + '"]').replaceWith(fileItem);
$('[data-toggle="tooltip"]').tooltip();
},
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 8c91ff261e4..eccdc49bc31 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -100,6 +100,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
<a href="#" class="button icon-upload"><?php p($l->t('Select or drop files')) ?></a>
<div id="drop-upload-progress-indicator" style="padding-top: 25px;" class="hidden"><?php p($l->t('Uploading files…')) ?></div>
<div id="drop-upload-done-indicator" style="padding-top: 25px;" class="hidden"><?php p($l->t('Uploaded files:')) ?></div>
+ <ul id="drop-uploaded-files"></ul>
<?php if (!empty($_['disclaimer'])) { ?>
<div>