Skip to content

show error message when "files-drop" upload fails #4545

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
blizzz merged 2 commits into from
May 2, 2017
Merged

show error message when "files-drop" upload fails #4545

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79c760a
use jqXHR.fail() to check for failures
individual-it Apr 27, 2017
f2f2e7b
some small refactoring and reformating
individual-it Apr 27, 2017
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
29 changes: 19 additions & 10 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 @@ -72,34 +72,43 @@
return true;
},

setFileIcon: function (fileName,fileIcon) {
$('#public-upload ul li[data-name="' + fileName + '"]').html(fileIcon);
$('[data-toggle="tooltip"]').tooltip();
},

initialize: function () {
$(document).bind('drop dragover', function (e) {
// Prevent the default browser drop action:
e.preventDefault();
});
var output = this.template();
var fileName = undefined;
Copy link
Member

@blizzz blizzz May 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not necessary to assign undefined

$('#public-upload').fileupload({
type: 'PUT',
dropZone: $('#public-upload'),
sequentialUploads: true,
add: function(e, data) {
Drop.addFileToUpload(e, data);
fileName = escapeHTML(data.files[0].name);
//we return true to keep trying to upload next file even
//if addFileToUpload did not like the privious one
return true;
},
done: function(e, data) {
// Created
if (data.jqXHR.status === 201) {
var mimeTypeUrl = OC.MimeType.getIconUrl(data.files[0].type);
$('#public-upload ul li[data-name="' + escapeHTML(data.files[0].name) + '"]').html('<img src="' + escapeHTML(mimeTypeUrl) + '"/> ' + escapeHTML(data.files[0].name));
$('[data-toggle="tooltip"]').tooltip();
} else {
var name = data.files[0].name;
OC.Notification.showTemporary(OC.L10N.translate('files_sharing', 'Could not upload "{filename}"', {filename: name}));
$('#public-upload ul li[data-name="' + escapeHTML(name) + '"]').html(output({isUploading: false, name: escapeHTML(name)}));
$('[data-toggle="tooltip"]').tooltip();
}
var mimeTypeUrl = OC.MimeType.getIconUrl(data.files[0].type);
var fileIcon = '<img src="' + escapeHTML(mimeTypeUrl) + '"/> ' + fileName;
Drop.setFileIcon(fileName,fileIcon);
},
fail: function(e, data, errorThrown) {
OC.Notification.showTemporary(OC.L10N.translate(
'files_sharing',
'Could not upload "{filename}"',
{filename: fileName}
));
var fileIcon = output({isUploading: false, name: fileName});
Drop.setFileIcon(fileName,fileIcon);
},
progressall: function (e, data) {
var progress = parseInt(data.loaded / data.total * 100, 10);
Expand Down