diff options
Diffstat (limited to 'www/js/musicpools.js')
-rw-r--r-- | www/js/musicpools.js | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/www/js/musicpools.js b/www/js/musicpools.js index 2292aa1..c56ab78 100644 --- a/www/js/musicpools.js +++ b/www/js/musicpools.js @@ -179,6 +179,9 @@ Rdxport.MusicpoolView.prototype.render = function() { $(uploads).each(function(index, upload) { var $el = Rdxport.MusicpoolCartView.renderUploading(upload, self.model.number); $('table > tbody', self.$el).append($el); + if (upload.error) { + self.uploadError(upload); + } }); @@ -188,6 +191,9 @@ Rdxport.MusicpoolView.prototype.render = function() { }; Rdxport.MusicpoolView.prototype.uploadProgress = function(upload) { + if (!upload.uploadId) { + return; + } var $cart = $('tr[data-upload-id="' + upload.uploadId + '"]').first(); if (!$cart.hasClass('uploading')) { var $progressBar = $('.progressBarTemplate.musicpools').clone().removeClass('progressBarTemplate'); @@ -209,8 +215,8 @@ Rdxport.MusicpoolView.prototype.uploadProgress = function(upload) { updateProgressBar($cart, upload); }; -Rdxport.MusicpoolView.prototype.uploadError = function(upload, status, errorString, acknowledge) { - var reason = $('<span>').addClass('label').addClass('label-danger').text(status).after($('<b>').text(' ' + errorString)); +Rdxport.MusicpoolView.prototype.uploadError = function(upload) { + var reason = $('<span>').addClass('label').addClass('label-danger').text(upload.errorStatus).after($('<b>').text(' ' + upload.errorString)); var dismiss_button = '<button class="btn btn-info btn-xs">' + '<span class="glyphicon glyphicon-remove"></span> Ok</button>'; @@ -231,7 +237,7 @@ Rdxport.MusicpoolView.prototype.uploadError = function(upload, status, errorStri } $('button', $errorRow).on('click', function() { - acknowledge(); + upload.close(); }); var $cart = $('tr[data-upload-id="' + upload.uploadId + '"]').first(); |