summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
authorPeter Grassberger <petertheone@gmail.com>2016-02-09 21:21:15 (GMT)
committerPeter Grassberger <petertheone@gmail.com>2016-02-09 21:21:15 (GMT)
commit6f2d7a5dd61746a114488151cda132e032b10bb1 (patch)
tree3edc8ef422136cb4bd3103745a36434b04a62283 /www/js
parent2e86eed89988d2984be29c7a3baeaaf85d7c9adf (diff)
musicpools: replace spinner
Diffstat (limited to 'www/js')
-rw-r--r--www/js/jingles.js1
-rw-r--r--www/js/musicpools.js4
2 files changed, 3 insertions, 2 deletions
diff --git a/www/js/jingles.js b/www/js/jingles.js
index 86c1553..377f5b8 100644
--- a/www/js/jingles.js
+++ b/www/js/jingles.js
@@ -196,7 +196,6 @@ Rivendell.JingleCutView.prototype.render = function() {
this.$spinner = $('#hiddenTemplates .spinnerTemplate').clone().removeClass('spinnerTemplate');
-
this.$el = $('<tr>')
.attr('id', 'jingle-' + this.model.cartNumber + '-' + this.model.number)
.append($('<td>').append(status))
diff --git a/www/js/musicpools.js b/www/js/musicpools.js
index 6af133f..e77c23c 100644
--- a/www/js/musicpools.js
+++ b/www/js/musicpools.js
@@ -180,6 +180,7 @@ Rivendell.MusicpoolView.prototype.uploadProgress = function(file) {
Rivendell.MusicpoolCartView = function(model) {
this.model = model;
+ this.$spinner = null;
this.$el = null;
this.render();
@@ -213,6 +214,7 @@ Rivendell.MusicpoolCartView.prototype.render = function() {
self.delete();
});
+ this.$spinner = $('#hiddenTemplates .spinnerTemplate').clone().removeClass('spinnerTemplate');
this.$el = $('<tr>')
.attr('id', 'musicpool-' + this.model.number)
@@ -228,7 +230,7 @@ Rivendell.MusicpoolCartView.prototype.render = function() {
};
Rivendell.MusicpoolCartView.prototype.delete = function() {
- this.$el.find('td:last').html('<span class="label label-default"><span class="glyphicon glyphicon-repeat spin"></span></span>')
+ this.$el.find('td:last').html(this.$spinner);
var self = this;
rivendell.removeCart(this.model.number, function() {