summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2015-09-24 14:24:23 (GMT)
committerChristian Pointner <equinox@helsinki.at>2015-09-24 14:24:23 (GMT)
commit02965e38cfc1e7ecbc626f151010b9469c2d48d0 (patch)
tree78973e0fdc19c18beb39d46d64b5646e2c471411
parentea0709ddb5d412be90b423f4fc279b33812b7ebf (diff)
removing m4a and aac from file filter as rivendell still has problems with these formats
-rw-r--r--www/js/jingles.js2
-rw-r--r--www/js/shows.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/www/js/jingles.js b/www/js/jingles.js
index b95eeb1..89a8c2e 100644
--- a/www/js/jingles.js
+++ b/www/js/jingles.js
@@ -481,7 +481,7 @@ Importer.prototype.showUploadModal = function(cart) {
uploadMultiple: false, // todo: maybe enable this?
clickable: true,
createImageThumbnails: false,
- acceptedFiles: '.flac,.wav,.ogg,.mp3,.m4a,.aac',
+ acceptedFiles: '.flac,.wav,.ogg,.mp3',
autoProcessQueue: false,
init: function() {
this.on("addedfile", function(file) {
diff --git a/www/js/shows.js b/www/js/shows.js
index 151eb36..268a76d 100644
--- a/www/js/shows.js
+++ b/www/js/shows.js
@@ -130,7 +130,7 @@ function shows_importCart(cart) {
$('#uploadModal-confirm').attr('disabled','disabled').unbind('click');
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,.m4a,.aac", autoProcessQueue: false, init: function() {
+ acceptedFiles: ".flac,.wav,.ogg,.mp3", 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); });
}});