diff options
| author | Peter Grassberger <petertheone@gmail.com> | 2015-09-26 22:59:34 (GMT) |
|---|---|---|
| committer | Peter Grassberger <petertheone@gmail.com> | 2015-09-26 22:59:34 (GMT) |
| commit | d12757624d1dd870fecc1854a75c95720d680828 (patch) | |
| tree | c8b8bff6127e8c191608a070308f5bf621025af8 /www | |
| parent | c43c8aecff0ce1c5fcbb1d28897e13959083fb1b (diff) | |
| parent | 02965e38cfc1e7ecbc626f151010b9469c2d48d0 (diff) | |
Merge branch 'master' of ssh://git@git.helsinki.at:2342/rhwebimport.git
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/jingles.js | 2 | ||||
| -rw-r--r-- | www/js/shows.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/www/js/jingles.js b/www/js/jingles.js index b40c973..16fbf8d 100644 --- a/www/js/jingles.js +++ b/www/js/jingles.js @@ -457,7 +457,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); }); }}); |