1 files changed, 15 insertions, 16 deletions

diff --git a/www/js/shows.js b/www/js/shows.js
index 3b949f5..d14d99e 100644
--- a/www/js/shows.js
+++ b/www/js/shows.js
@@ -79,8 +79,8 @@ function shows_importUpdateProgress(file, stats) {
 }
 
 function shows_importCartConfirm(cart, dz) {
-  $('#shows-upload').modal('hide');
-  var cart_row = $('#show-cart-' + cart)
+  $('#uploadModal').modal('hide');
+  var cart_row = $('#show-cart-' + cart);
   cart_row.find('.btn').attr('disabled','disabled');
   var importing_row = shows_newImportingEntry(cart);
   importing_row.find('button').unbind('click').click(function() { shows_importCartCancel(cart, dz); });
@@ -111,23 +111,23 @@ function shows_createImportForm(cart) {
 
 function shows_importFileAdded(dz, file, cart) {
   $(dz.getAcceptedFiles()).each(function(idx, elem) { dz.removeFile(elem); });
-  $('#shows-upload div.modal-body').css("background-image", "url('/img/audio_file.png')")
-  $('#shows-upload div.modal-header h3').text(file.name)
-  $('#shows-upload-confirm').removeAttr('disabled').unbind('click').click(function() { shows_importCartConfirm(cart, dz); });
+  $('#uploadModal div.modal-body').css("background-image", "url('/img/audio_file.png')")
+  $('#uploadModal div.modal-header h3').text(file.name)
+  $('#uploadModal-confirm').removeAttr('disabled').unbind('click').click(function() { shows_importCartConfirm(cart, dz); });
 }
 
 function shows_importFileSelectError(dz, file, msg) {
-  $('#shows-upload div.modal-header h3').text("Datei auswählen...")
-  $('#shows-upload div.modal-body').css("background-image", "url('/img/dz-backdrop.png')");
-  $('#shows-upload-confirm').attr('disabled','disabled').unbind('click');
+  $('#uploadModal div.modal-header h3').text("Datei auswählen...")
+  $('#uploadModal div.modal-body').css("background-image", "url('/img/dz-backdrop.png')");
+  $('#uploadModal-confirm').attr('disabled','disabled').unbind('click');
   dz.removeFile(file);
 }
 
 function shows_importCart(cart) {
   var form = shows_createImportForm(cart);
-  $('#shows-upload div.modal-header h3').text("Datei auswählen...")
-  $('#shows-upload div.modal-body').empty().append(form).css("background-image", "url('/img/dz-backdrop.png')");
-  $('#shows-upload-confirm').attr('disabled','disabled').unbind('click');
+  $('#uploadModal div.modal-header h3').text("Datei auswählen...")
+  $('#uploadModal div.modal-body').empty().append(form).css("background-image", "url('/img/dz-backdrop.png')");
+  $('#uploadModal-confirm').attr('disabled','disabled').unbind('click');
   var dz = form.dropzone({ url: "/rd-bin/rdxport.cgi", parallelUploads: 1, maxFilesize: 2048, paramName: 'FILENAME',
                            uploadMultiple: false, clickable: true, createImageThumbnails: false,
                            acceptedFiles: ".flac,.wav,.ogg,.mp3,.m4a", autoProcessQueue: false, init: function() {
@@ -135,7 +135,7 @@ function shows_importCart(cart) {
             this.on("error", function(file, msg) { shows_importFileSelectError(this, file, msg); });
     }});
 
-  $('#shows-upload').modal({ keyboard: true });
+  $('#uploadModal').modal({ keyboard: true });
 }
 
 // <td>
@@ -207,10 +207,9 @@ function shows_newImportErrorEntry(cart, msg) {
 
 function shows_updateGroupCartInfo(cart) {
   data = { COMMAND: 7, LOGIN_NAME: auth_username, PASSWORD: auth_token, CART_NUMBER: cart, INCLUDE_CUTS: 1 };
-  var defer = $.post("/rd-bin/rdxport.cgi", data, shows_updateGroupCartList, "xml")
-                           .fail(function() { delete shows_group_carts[cart]; shows_redrawCartEntry(cart); });
-
-  $.when(defer).done(function() { shows_redrawCartEntry(cart); });
+  $.post("/rd-bin/rdxport.cgi", data, shows_updateGroupCartList, "xml")
+    .fail(function() { delete shows_group_carts[cart]; shows_redrawCartEntry(cart); })
+    .done(function() { shows_redrawCartEntry(cart); });
 }
 
 function shows_redrawCartEntry(cart) {