Skip to content

[stable15] Re add the uploaded file list to file drops #13355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 4 commits into from
Jan 4, 2019
Merged

[stable15] Re add the uploaded file list to file drops #13355

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92d30c8
Add the file drop uploaded files element
weeman1337 Dec 29, 2018
ac28dec
Removes lost single quote
weeman1337 Dec 29, 2018
7549bd2
Tweak the uploaded files icon position
weeman1337 Dec 29, 2018
03ca330
Add compiled template
weeman1337 Dec 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add the file drop uploaded files element 
Signed-off-by: Michael Weimann <[email protected]>
  • Loading branch information
@weeman1337
weeman1337 authored and Backportbot committed Jan 4, 2019
commit 92d30c8005e852761f6c787eb5eed7dda2cf3866
4 changes: 2 additions & 2 deletions apps/files_sharing/js/files_drop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@
$('#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();

return true;
},

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();
},

Expand Down
1 change: 1 addition & 0 deletions apps/files_sharing/templates/public.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ class="<?php if (!empty($_['note'])) { ?>has-note<?php } ?>">
<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>
Expand Down