summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2015-06-18 23:30:24 (GMT)
committerChristian Pointner <equinox@helsinki.at>2015-06-18 23:30:24 (GMT)
commitc735a8aa1c9c8913398af5955664315cf9944e99 (patch)
treed8a0c7f74f2bd2abcfa03a029022b584b075eea4
parent693c08cc3b86d289f983b1c03fe1fdf02fef8a7d (diff)
added .m4a und .aac to allowed extensions
fixed typos
-rw-r--r--www/js/shows.js4
-rw-r--r--www/js/utils.js4
2 files changed, 4 insertions, 4 deletions
diff --git a/www/js/shows.js b/www/js/shows.js
index cbf4d73..a1119c3 100644
--- a/www/js/shows.js
+++ b/www/js/shows.js
@@ -98,9 +98,9 @@ function shows_importCart(cart) {
$('#shows-upload div.modal-header h3').text("Datei auswählen...")
$('#shows-upload div.modal-body').empty().append(form).css("background-image", "url('/img/dz-backdrop.png')");
$('#shows-upload-confirm').attr('disabled','disabled').unbind('click');
- var dz = form.dropzone({ url: "/rd-bin/rdxport.cgi", prallelUploads: 1, maxFilesize: 2048, paramName: 'FILENAME',
+ var dz = form.dropzone({ url: "/rd-bin/rdxport.cgi", parallelUploads: 1, maxFilesize: 2048, paramName: 'FILENAME',
uploadMultiple: false, clickable: true, createImageThumbnails: false,
- acceptedFiles: ".flac,.wav,.ogg,.mp3", autoProcessQueue: false, init: function() {
+ acceptedFiles: ".flac,.wav,.ogg,.mp3,.m4a,.aac", autoProcessQueue: false, init: function() {
this.on("addedfile", function(file) { shows_importFileAdded(this, file, cart); });
this.on("error", function(file, msg) { shows_importFileSelectError(this, file, msg); });
}});
diff --git a/www/js/utils.js b/www/js/utils.js
index 0237594..befd08b 100644
--- a/www/js/utils.js
+++ b/www/js/utils.js
@@ -16,7 +16,7 @@ Number.prototype.pad = function(size) {
}
var weekday = new Array(7);
-weekday[0] = "Sonntag";
+weekday[0] = "Sonntag";
weekday[1] = "Montag";
weekday[2] = "Dienstag";
weekday[3] = "Mittwoch";
@@ -48,7 +48,7 @@ function msToTimeString(time) {
time %= 60000;
var s = Number(Math.floor(time / 1000));
var hs = Number(Math.floor((time % 1000)/100));
-
+
return h + ':' + m.pad(2) + ':' + s.pad(2) + '.' + hs;
}