diff options
| -rw-r--r-- | js/shows.js | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/js/shows.js b/js/shows.js index dc03156..6da6345 100644 --- a/js/shows.js +++ b/js/shows.js @@ -18,20 +18,20 @@ function shows_importAddCut(cart, dz, file) { function shows_importAddCart(cart, dz, file) { data = { COMMAND: 12, LOGIN_NAME: auth_username, PASSWORD: auth_token, - GROUP_NAME: shows_current.group.name, TYPE: 'audio', CART_NUMBER: cart }; + GROUP_NAME: shows_current.group.name, TYPE: 'audio', CART_NUMBER: cart }; $.post("/rd-bin/rdxport.cgi", data, null, "xml").done(function() { shows_importAddCut(cart, dz, file); }) .fail(function(xhr, status, err) { shows_importFileUploadError(cart, dz, file, err, xhr); }); } function shows_importCartCancel(cart, dz) { - shows_deleteCart(cart); + shows_deleteCart(cart); dz.off("error"); dz.disable(); } function shows_importFileUploadError(cart, dz, file, msg, xhr) { alertbox.error('app-shows', "Import Fehler", $('<div>').append($('<pre>').text(msg)).html()); - shows_deleteCart(cart); + shows_deleteCart(cart); dz.disable(); } @@ -40,9 +40,8 @@ function shows_importFileUploadSuccess(cart, dz, file) { dz.disable(); } -function shows_importUpdateProgress(file, stats) -{ - var bytes_str = Number((file.upload.bytesSent/1024)/1024).toFixed(1) + " von " + +function shows_importUpdateProgress(file, stats) { + var bytes_str = Number((file.upload.bytesSent/1024)/1024).toFixed(1) + " von " + Number((file.upload.total/1024)/1024).toFixed(1) + " MB"; stats.find('.file-bytes').text(bytes_str); stats.find('.progress .bar').css("width", file.upload.progress + "%"); @@ -69,15 +68,15 @@ function shows_importCartConfirm(cart, dz) { function shows_createImportForm(cart) { return $('<form>').attr("action", "/rd-bin/rdxport.cgi").attr("method", "post").attr("enctype", "multipart/form-data") - .append($('<input>').attr("type", "hidden").attr("name", "COMMAND").attr("value", 2)) - .append($('<input>').attr("type", "hidden").attr("name", "LOGIN_NAME").attr("value", auth_username)) - .append($('<input>').attr("type", "hidden").attr("name", "PASSWORD").attr("value", auth_token)) - .append($('<input>').attr("type", "hidden").attr("name", "CART_NUMBER").attr("value", cart)) - .append($('<input>').attr("type", "hidden").attr("name", "CUT_NUMBER").attr("value", 1)) - .append($('<input>').attr("type", "hidden").attr("name", "CHANNELS").attr("value", 2)) - .append($('<input>').attr("type", "hidden").attr("name", "NORMALIZATION_LEVEL").attr("value", shows_current.normlevel)) - .append($('<input>').attr("type", "hidden").attr("name", "AUTOTRIM_LEVEL").attr("value", shows_current.trimlevel)) - .append($('<input>').attr("type", "hidden").attr("name", "USE_METADATA").attr("value", 1)); + .append($('<input>').attr("type", "hidden").attr("name", "COMMAND").attr("value", 2)) + .append($('<input>').attr("type", "hidden").attr("name", "LOGIN_NAME").attr("value", auth_username)) + .append($('<input>').attr("type", "hidden").attr("name", "PASSWORD").attr("value", auth_token)) + .append($('<input>').attr("type", "hidden").attr("name", "CART_NUMBER").attr("value", cart)) + .append($('<input>').attr("type", "hidden").attr("name", "CUT_NUMBER").attr("value", 1)) + .append($('<input>').attr("type", "hidden").attr("name", "CHANNELS").attr("value", 2)) + .append($('<input>').attr("type", "hidden").attr("name", "NORMALIZATION_LEVEL").attr("value", shows_current.normlevel)) + .append($('<input>').attr("type", "hidden").attr("name", "AUTOTRIM_LEVEL").attr("value", shows_current.trimlevel)) + .append($('<input>').attr("type", "hidden").attr("name", "USE_METADATA").attr("value", 1)); } function shows_importFileAdded(dz, file, cart) { @@ -100,11 +99,11 @@ function shows_importCart(cart) { $('#shows-upload div.modal-body').empty().append(form).css("background-image", "url('/img/dz-backdrop.png')"); $('#shows-upload-confirm').attr('disabled','disabled').unbind('click'); var dz = form.dropzone({ url: "/rd-bin/rdxport.cgi", prallelUploads: 1, maxFilesize: 2048, paramName: 'FILENAME', - uploadMultiple: false, clickable: true, createImageThumbnails: false, - acceptedFiles: ".flac,.wav,.ogg,.mp3", autoProcessQueue: false, init: function() { - this.on("addedfile", function(file) { shows_importFileAdded(this, file, cart); }); + uploadMultiple: false, clickable: true, createImageThumbnails: false, + acceptedFiles: ".flac,.wav,.ogg,.mp3", autoProcessQueue: false, init: function() { + this.on("addedfile", function(file) { shows_importFileAdded(this, file, cart); }); this.on("error", function(file, msg) { shows_importFileSelectError(this, file, msg); }); - }}); + }}); $('#shows-upload').modal({ keyboard: true }); } @@ -120,8 +119,7 @@ function shows_importCart(cart) { // <button class="btn btn-success btn-mini"><i class="icon-upload icon-white"></i> Importieren</button> // </td> -function shows_getDzStat(empty) -{ +function shows_getDzStat(empty) { if(empty) { return $('<tr>').append($('<td colspan=6>').css("border", 0) .css("height", 0) @@ -282,8 +280,7 @@ function shows_updateList(data, status, req) { shows_showSelected(); } -function shows_drawCurrentWeek() -{ +function shows_drawCurrentWeek() { var weekspan = $('#current-week').removeClass().addClass('label'); switch(get_rd_week()) { case 1: |