Commit 99ab3d13 authored by Guillaume Perréal's avatar Guillaume Perréal
Browse files

js: fusionne les définitions de fichier renvoyées par le serveur les données qu'on avait déjà.

Showing with 8 additions and 1 deletion
+8 -1
......@@ -161,7 +161,14 @@
$this.find('.progress-bar').css('width', percent + '%').attr('aria-valuenow', percentText);
$this.find('.progress-text').show().html(percentText + '% ('+formatBitrate(data.bitrate)+')');
});
}
},
getFilesFromResponse: function(data) {
var files = [];
$.each(data.files, function(index, file) {
files.push($.extend(file, data.result.files[index]));
});
return files;
},
}
)).bind({
fileuploadfailed: function (e, data) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment