From fbb98febbf9503fbdfb6af18fac6791a31755e9a Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 19 Jun 2015 02:08:55 +0200 Subject: seperatly marking importing (vs. uploading) diff --git a/www/js/shows.js b/www/js/shows.js index a1119c3..6979b7e 100644 --- a/www/js/shows.js +++ b/www/js/shows.js @@ -41,10 +41,16 @@ function shows_importFileUploadSuccess(cart, dz, file) { } 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 + "%"); + if(file.upload.progress < 99) { + 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 + "%"); + } else { + stats.find('.file-bytes').text("importiere..."); + stats.find('.progress .bar').css("width", "100%"); + stats.find('.progress').addClass('active'); + } } function shows_importCartConfirm(cart, dz) { -- cgit v0.10.2