summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files_sharing/js/files_drop.js14
1 files changed, 6 insertions, 8 deletions
diff --git a/apps/files_sharing/js/files_drop.js b/apps/files_sharing/js/files_drop.js
index edd7cc90827..67c1bfb3b4a 100644
--- a/apps/files_sharing/js/files_drop.js
+++ b/apps/files_sharing/js/files_drop.js
@@ -64,7 +64,7 @@
$('#drop-upload-done-indicator').addClass('hidden');
$('#drop-upload-progress-indicator').removeClass('hidden');
_.each(data['files'], function(file) {
- $('#public-upload ul').append(output({isUploading: true, name: escapeHTML(file.name)}));
+ $('#public-upload ul').append(output({isUploading: true, name: file.name}));
$('[data-toggle="tooltip"]').tooltip();
data.submit();
});
@@ -83,14 +83,12 @@
e.preventDefault();
});
var output = this.template();
- var fileName = 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;
@@ -98,18 +96,18 @@
done: function(e, data) {
// Created
var mimeTypeUrl = OC.MimeType.getIconUrl(data.files[0].type);
- var fileItem = output({isUploading: false, iconSrc: mimeTypeUrl, name: fileName});
- Drop.updateFileItem(fileName, fileItem);
+ var fileItem = output({isUploading: false, iconSrc: mimeTypeUrl, name: data.files[0].name});
+ Drop.updateFileItem(data.files[0].name, fileItem);
},
fail: function(e, data) {
OC.Notification.showTemporary(OC.L10N.translate(
'files_sharing',
'Could not upload "{filename}"',
- {filename: fileName}
+ {filename: data.files[0].name}
));
var errorIconSrc = OC.imagePath('core', 'actions/error.svg');
- var fileItem = output({isUploading: false, iconSrc: errorIconSrc, name: fileName});
- Drop.updateFileItem(fileName, fileItem);
+ var fileItem = output({isUploading: false, iconSrc: errorIconSrc, name: data.files[0].name});
+ Drop.updateFileItem(data.files[0].name, fileItem);
},
progressall: function (e, data) {
var progress = parseInt(data.loaded / data.total * 100, 10);