summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/js/apps.js1
-rw-r--r--www/js/importer.js20
-rw-r--r--www/js/jingles.js35
-rw-r--r--www/js/musicpools.js35
-rw-r--r--www/js/shows.js25
-rw-r--r--www/js/utils.js13
6 files changed, 77 insertions, 52 deletions
diff --git a/www/js/apps.js b/www/js/apps.js
index e25c7d1..6de7da3 100644
--- a/www/js/apps.js
+++ b/www/js/apps.js
@@ -136,7 +136,6 @@ function apps_init() {
window.onbeforeunload = function(e) {
if (importer && importer.isUploading()) {
return 'Achtung: Es laufen noch imports.';
- return;
}
};
}
diff --git a/www/js/importer.js b/www/js/importer.js
index cba7d23..7e190f2 100644
--- a/www/js/importer.js
+++ b/www/js/importer.js
@@ -113,24 +113,28 @@ Rivendell.Importer.prototype.removeUpload = function(upload) {
});
};
-Rivendell.Importer.prototype.getUploadByCartId = function (cartNumber) {
+Rivendell.Importer.prototype.getUploadByCartNumber = function (cartNumber) {
var upload = null;
$.each(this.uploads, function(index, currentUpload){
- if (currentUpload.newCartNumber === cartNumber) {
+ if (currentUpload.cart !== null &&
+ currentUpload.cart.number === cartNumber ) {
upload = currentUpload;
}
});
return upload;
};
-Rivendell.Importer.prototype.hasUploadByCartId = function (cartNumber) {
- var found = false;
- $.each(this.uploads, function(index, currentUpload){
- if (currentUpload.newCartNumber === cartNumber) {
- found = true;
+Rivendell.Importer.prototype.getUploadByCartAndCutNumber = function (cartNumber, cutNumber) {
+ var upload = null;
+ $.each(this.uploads, function(index, currentUpload) {
+ if (currentUpload.cart !== null &&
+ currentUpload.cart.number === cartNumber &&
+ currentUpload.cut !== null &&
+ currentUpload.cut.number === cutNumber) {
+ upload = currentUpload;
}
});
- return found;
+ return upload;
};
Rivendell.Upload = function(group, groupView, createCart, newCartNumber, useMetadata, dropzone) {
diff --git a/www/js/jingles.js b/www/js/jingles.js
index 4748df8..7910b97 100644
--- a/www/js/jingles.js
+++ b/www/js/jingles.js
@@ -135,16 +135,7 @@ Rivendell.JingleGroupView.prototype.uploadProgress = function(upload, file) {
$cut.addClass('uploading');
}
- 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";
- $cut.find('.file-bytes').text(bytes_str);
- $cut.find('.progress .progress-bar').css("width", file.upload.progress + "%");
- } else {
- $cut.find('.file-bytes').text('importiere...');
- $cut.find('.progress .progress-bar').css('width', '100%');
- $cut.find('.progress .progress-bar').addClass('progress-bar-striped').addClass('active');
- }
+ updateProgressBar($cut, upload);
};
Rivendell.JingleGroupView.prototype.uploadError = function(upload, file, msg, xhr, acknowledge) {
@@ -208,7 +199,12 @@ Rivendell.JingleCutView = function(model) {
this.$spinner = null;
this.$el = null;
- this.render();
+ var upload = null;
+ if ((upload = importer.getUploadByCartAndCutNumber(this.model.cartNumber, this.model.number)) !== null) {
+ this.renderUploading(upload);
+ } else {
+ this.render();
+ }
};
Rivendell.JingleCutView.prototype.render = function() {
@@ -259,6 +255,23 @@ Rivendell.JingleCutView.prototype.render = function() {
);
};
+Rivendell.JingleCutView.prototype.renderUploading = function(upload) {
+ var $progressBar = $('.progressBarTemplate.jingles').clone().removeClass('progressBarTemplate');
+ $('.file-name', $progressBar).text(this.model.name);
+ $('.cart-number', $progressBar).text(this.model.number);
+
+ this.$el = $('<tr>')
+ .attr('id', 'jingle-' + this.model.cartNumber + '-' + this.model.number)
+ .html($progressBar.html())
+ .addClass('uploading');
+
+ $('button', this.$el).on('click', function() {
+ upload.cancel();
+ });
+
+ updateProgressBar(this.$el, upload);
+};
+
Rivendell.JingleCutView.prototype.move = function() {
this.$el.find('td:first').html(this.$spinner);
var self = this;
diff --git a/www/js/musicpools.js b/www/js/musicpools.js
index 1a2c78d..01331f6 100644
--- a/www/js/musicpools.js
+++ b/www/js/musicpools.js
@@ -170,16 +170,7 @@ Rivendell.MusicpoolView.prototype.uploadProgress = function(upload, file) {
$cart.addClass('uploading');
}
- 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";
- $cart.find('.file-bytes').text(bytes_str);
- $cart.find('.progress .progress-bar').css("width", file.upload.progress + "%");
- } else {
- $cart.find('.file-bytes').text('importiere...');
- $cart.find('.progress .progress-bar').css('width', '100%');
- $cart.find('.progress .progress-bar').addClass('progress-bar-striped').addClass('active');
- }
+ updateProgressBar($cart, upload);
};
Rivendell.MusicpoolView.prototype.uploadError = function(upload, file, msg, xhr, acknowledge) {
@@ -219,7 +210,12 @@ Rivendell.MusicpoolCartView = function(model) {
this.$spinner = null;
this.$el = null;
- this.render();
+ var upload = null;
+ if ((upload = importer.getUploadByCartNumber(this.model.number)) !== null) {
+ this.renderUploading(upload);
+ } else {
+ this.render();
+ }
};
Rivendell.MusicpoolCartView.prototype.render = function() {
@@ -263,6 +259,23 @@ Rivendell.MusicpoolCartView.prototype.render = function() {
.append($('<td>').addClass('text-center').append(deleteButton));
};
+Rivendell.MusicpoolCartView.prototype.renderUploading = function(upload) {
+ var $progressBar = $('.progressBarTemplate.musicpools').clone().removeClass('progressBarTemplate');
+ $('.file-name', $progressBar).text(this.model.title);
+ $('.cart-number', $progressBar).text(this.model.number);
+
+ this.$el = $('<tr>')
+ .attr('id', 'musicpool-' + this.model.number)
+ .html($progressBar.html())
+ .addClass('uploading');
+
+ $('button', this.$el).on('click', function() {
+ upload.cancel();
+ });
+
+ updateProgressBar(this.$el, upload);
+};
+
Rivendell.MusicpoolCartView.prototype.delete = function() {
this.$el.find('td:last').html(this.$spinner);
diff --git a/www/js/shows.js b/www/js/shows.js
index b910bdb..0e5c776 100644
--- a/www/js/shows.js
+++ b/www/js/shows.js
@@ -204,7 +204,7 @@ Rivendell.ShowView.prototype.render = function() {
var cartView = new Rivendell.ShowCartView(cart, self);
self.cartViews.push(cartView);
var upload = null;
- if ((upload = importer.getUploadByCartId(log.cartNumber)) !== null) {
+ if ((upload = importer.getUploadByCartNumber(log.cartNumber)) !== null) {
cartView.renderUploading(upload);
} else {
cartView.render();
@@ -235,16 +235,7 @@ Rivendell.ShowView.prototype.uploadProgress = function(upload, file) {
$cart.addClass('uploading');
}
- if(upload.uploadprogress.progress < 99) {
- var bytes_str = Number((upload.uploadprogress.bytesSent/1024)/1024).toFixed(1) + " von " +
- Number((upload.uploadprogress.total/1024)/1024).toFixed(1) + " MB";
- $cart.find('.file-bytes').text(bytes_str);
- $cart.find('.progress .progress-bar').css("width", upload.uploadprogress.progress + "%");
- } else {
- $cart.find('.file-bytes').text('importiere...');
- $cart.find('.progress .progress-bar').css('width', '100%');
- $cart.find('.progress .progress-bar').addClass('progress-bar-striped').addClass('active');
- }
+ updateProgressBar($cart, upload);
};
Rivendell.ShowView.prototype.uploadError = function(upload, file, msg, xhr, acknowledge) {
@@ -324,6 +315,7 @@ Rivendell.ShowCartView.prototype.renderUploading = function(upload) {
$('.cart-number', $progressBar).text(this.model.number);
this.$el.empty()
+ .attr('id', 'show-cart-' + this.model.number)
.html($progressBar.html())
.attr('id', 'show-cart-' + this.model.number)
.addClass('uploading');
@@ -332,16 +324,7 @@ Rivendell.ShowCartView.prototype.renderUploading = function(upload) {
upload.cancel();
});
- if(upload.uploadprogress.progress < 99) {
- var bytes_str = Number((upload.uploadprogress.bytesSent/1024)/1024).toFixed(1) + " von " +
- Number((upload.uploadprogress.total/1024)/1024).toFixed(1) + " MB";
- this.$el.find('.file-bytes').text(bytes_str);
- this.$el.find('.progress .progress-bar').css("width", upload.uploadprogress.progress + "%");
- } else {
- this.$el.find('.file-bytes').text('importiere...');
- this.$el.find('.progress .progress-bar').css('width', '100%');
- this.$el.find('.progress .progress-bar').addClass('progress-bar-striped').addClass('active');
- }
+ updateProgressBar(this.$el, upload);
};
Rivendell.ShowCartView.renderEmpty = function(group, groupView, cartNumber) {
diff --git a/www/js/utils.js b/www/js/utils.js
index fab6736..97f06e7 100644
--- a/www/js/utils.js
+++ b/www/js/utils.js
@@ -140,3 +140,16 @@ jQuery.fn.brightness = function() {
if (this.parent().length) return this.parent().brightness();
}
};
+
+function updateProgressBar($el, upload) {
+ if(upload.uploadprogress.progress < 99) {
+ var bytes_str = Number((upload.uploadprogress.bytesSent/1024)/1024).toFixed(1) + " von " +
+ Number((upload.uploadprogress.total/1024)/1024).toFixed(1) + " MB";
+ $el.find('.file-bytes').text(bytes_str);
+ $el.find('.progress .progress-bar').css("width", upload.uploadprogress.progress + "%");
+ } else {
+ $el.find('.file-bytes').text('importiere...');
+ $el.find('.progress .progress-bar').css('width', '100%');
+ $el.find('.progress .progress-bar').addClass('progress-bar-striped').addClass('active');
+ }
+}
generated by cgit v0.10.2 at 2024-12-22 10:48:47 (GMT)