summaryrefslogtreecommitdiff
path: root/www/js/jingles.js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js/jingles.js')
-rw-r--r--www/js/jingles.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/www/js/jingles.js b/www/js/jingles.js
index 8d9ed86..ffaafcd 100644
--- a/www/js/jingles.js
+++ b/www/js/jingles.js
@@ -132,7 +132,7 @@ Rdxport.JingleGroupView.prototype.uploadProgress = function(upload) {
$cut.addClass('uploading');
}
- if (upload.title) {
+ if (!upload.isNew && upload.title) {
$('.file-name', $cut).text(upload.title);
}
if (upload.cartNumber && upload.cutNumber) {
@@ -283,7 +283,12 @@ Rdxport.JingleCutView.prototype.render = function() {
Rdxport.JingleCutView.renderUploading = function(upload) {
var $progressBar = $('.progressBarTemplate.jingles').clone().removeClass('progressBarTemplate');
- $('.file-name', $progressBar).text(upload.title);
+ if (upload.isNew) {
+ var spinner = $('#hiddenTemplates .spinnerTemplate').clone().removeClass('spinnerTemplate');
+ $('.file-name', $progressBar).html(spinner);
+ } else {
+ $('.file-name', $progressBar).text(upload.title);
+ }
var $el = $('<tr>')
.html($progressBar.html())