summaryrefslogtreecommitdiff
path: root/www/js/jingles.js
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2016-07-14 00:24:43 (GMT)
committerChristian Pointner <equinox@helsinki.at>2016-07-14 00:25:00 (GMT)
commit8950c5830665de3c20a0d142f69f8bd33ef74183 (patch)
treee66b462f56a52191bbb3ea306a7fd4ec68435307 /www/js/jingles.js
parent3dde5e42704bb5633827f0b7ba4a403d98365c22 (diff)
import errors are now somehow handled - still needs love
Diffstat (limited to 'www/js/jingles.js')
-rw-r--r--www/js/jingles.js11
1 files changed, 2 insertions, 9 deletions
diff --git a/www/js/jingles.js b/www/js/jingles.js
index 64735f0..eeb3927 100644
--- a/www/js/jingles.js
+++ b/www/js/jingles.js
@@ -133,18 +133,11 @@ Rdxport.JingleGroupView.prototype.uploadProgress = function(upload, file) {
updateProgressBar($cut, upload);
};
-Rdxport.JingleGroupView.prototype.uploadError = function(upload, file, msg, xhr, acknowledge) {
+Rdxport.JingleGroupView.prototype.uploadError = function(upload, file, status, errorString, acknowledge) {
if (!file.cartNumber || !file.cutNumber) {
return;
}
- var responseCode = xhr.status;
- var errorString = xhr.statusText;
-
- //var xmlDoc = $.parseXML(msg);
- //var msg = $(xmlDoc);
- //var responseCode = msg.find('ResponseCode').text();
- //var errorString = msg.find('ErrorString').text();
- var reason = $('<span>').addClass('label').addClass('label-danger').text(responseCode).after($('<b>').text('&nbsp;' + errorString));
+ var reason = $('<span>').addClass('label').addClass('label-danger').text(status).after($('<b>').text(' ' + errorString));
var dismiss_button = '<button class="btn btn-info btn-xs">' +
'<span class="glyphicon glyphicon-remove"></span>&nbsp;&nbsp;Ok</button>';