summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js')
-rw-r--r--www/js/importer.js2
-rw-r--r--www/js/jingles.js4
-rw-r--r--www/js/shows.js1
3 files changed, 3 insertions, 4 deletions
diff --git a/www/js/importer.js b/www/js/importer.js
index 405c7fd..7f8a0d8 100644
--- a/www/js/importer.js
+++ b/www/js/importer.js
@@ -66,7 +66,7 @@ Rivendell.Importer.prototype.openModal = function(group, groupView, createCart,
self.$el.modal('hide');
})
- .removeAttr('disabled');
+ .removeAttr('disabled').focus();
});
this.$el.modal({keyboard: true});
};
diff --git a/www/js/jingles.js b/www/js/jingles.js
index 72ae3ae..c60d7fe 100644
--- a/www/js/jingles.js
+++ b/www/js/jingles.js
@@ -124,8 +124,8 @@ Rivendell.JingleGroupView.prototype.uploadProgress = function(upload, file) {
var $cut = $('#jingle-' + file.cartNumber + '-' + file.cutNumber).first();
if (!$cut.hasClass('uploading')) {
var $progressBar = $('.progressBarTemplate.jingles').clone().removeClass('progressBarTemplate');
- $progressBar.find('.file-name').text(file.name);
- $progressBar.find('.cart-number').text(file.cartNumber);
+ $('.file-name', $progressBar).text(file.name);
+ $('.cart-number', $progressBar).text(file.cartNumber);
$cut.html($progressBar.html());
$('button', $cut).on('click', function() {
diff --git a/www/js/shows.js b/www/js/shows.js
index e4417ad..c5c3581 100644
--- a/www/js/shows.js
+++ b/www/js/shows.js
@@ -239,7 +239,6 @@ Rivendell.ShowView.prototype.uploadProgress = function(upload, file) {
$('.cart-number', $progressBar).text(file.cartNumber);
$cart.html($progressBar.html());
- var self = this;
$('button', $cart).on('click', function() {
upload.cancel();
});