summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2015-06-19 00:08:55 (GMT)
committerChristian Pointner <equinox@helsinki.at>2015-06-19 00:08:55 (GMT)
commitfbb98febbf9503fbdfb6af18fac6791a31755e9a (patch)
tree0f96314d3072068259fef3487b17a8828339a1dc /www
parentc735a8aa1c9c8913398af5955664315cf9944e99 (diff)
seperatly marking importing (vs. uploading)
Diffstat (limited to 'www')
-rw-r--r--www/js/shows.js14
1 files changed, 10 insertions, 4 deletions
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) {