From 02965e38cfc1e7ecbc626f151010b9469c2d48d0 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 24 Sep 2015 16:24:23 +0200 Subject: removing m4a and aac from file filter as rivendell still has problems with these formats 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); }); }}); -- cgit v0.10.2