diff options
author | Peter Grassberger <petertheone@gmail.com> | 2016-01-31 16:52:43 (GMT) |
---|---|---|
committer | Peter Grassberger <petertheone@gmail.com> | 2016-01-31 16:52:43 (GMT) |
commit | e17fe1ce46af9990862f2e5f93064f4a9e4cbfd8 (patch) | |
tree | 061d2f949fb303e153f8e52d612b5a9cc1a8c8a6 /www/js/importer.js | |
parent | f306d3578d0ec18e34df3b7ed30e20fa71339bf6 (diff) |
musicpools: show carts/cuts, actions still missing
Diffstat (limited to 'www/js/importer.js')
-rw-r--r-- | www/js/importer.js | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/www/js/importer.js b/www/js/importer.js index d2c1e3b..25924fb 100644 --- a/www/js/importer.js +++ b/www/js/importer.js @@ -34,13 +34,17 @@ Rivendell.Importer.prototype.resetModal = function() { $('#uploadModal-confirm', this.$el).attr('disabled','disabled').off('click'); }; -Rivendell.Importer.prototype.openModal = function(group, createCart) { +Rivendell.Importer.prototype.openModal = function(group, createCart, useMetadata) { this.resetModal(); if (createCart === undefined) { createCart = false; } + if (useMetadata === undefined) { + useMetadata = false; + } + var $form = $('<form>'); var self = this; $form.dropzone({ @@ -55,7 +59,7 @@ Rivendell.Importer.prototype.openModal = function(group, createCart) { autoProcessQueue: false, init: function() { this.on('addedfile', function(file) { - self.importFileAdded(this, file, group, createCart); + self.importFileAdded(this, file, group, createCart, useMetadata); }); this.on('error', function(file, msg) { self.importFileSelectError(this, file, msg); @@ -67,7 +71,7 @@ Rivendell.Importer.prototype.openModal = function(group, createCart) { this.$el.modal({keyboard: true}); }; -Rivendell.Importer.prototype.importFileAdded = function(dropzone, file, group, createCart) { +Rivendell.Importer.prototype.importFileAdded = function(dropzone, file, group, createCart, useMetadata) { // wtf? remove accepted files? /*$(dropzone.getAcceptedFiles()).each(function(index, elem) { dropzone.removeFile(elem); @@ -78,7 +82,7 @@ Rivendell.Importer.prototype.importFileAdded = function(dropzone, file, group, c var self = this; $('#uploadModal-confirm', this.$el).off('click').on('click', function() { - self.importCartConfirm(dropzone, group, createCart); + self.importCartConfirm(dropzone, group, createCart, useMetadata); }).removeAttr('disabled'); }; @@ -87,7 +91,7 @@ Rivendell.Importer.prototype.importFileSelectError = function(dropzone, file, ms dropzone.removeFile(file); }; -Rivendell.Importer.prototype.importCartConfirm = function(dropzone, group, createCart) { +Rivendell.Importer.prototype.importCartConfirm = function(dropzone, group, createCart, useMetadata) { this.$el.modal('hide'); //var progressBar = group.addUpload(); @@ -120,11 +124,11 @@ Rivendell.Importer.prototype.importCartConfirm = function(dropzone, group, creat if (createCart) { rivendell.addCart(group.groupName, 'audio', null, function(cartXML) { var cart = new Rivendell.Cart(cartXML, group); - self.importAddCut(dropzone, group, files[0], createCart, cart); + self.importAddCut(dropzone, group, files[0], createCart, cart, useMetadata); }); } else { var cart = group.mainCart; - self.importAddCut(dropzone, group, files[0], createCart, cart); + self.importAddCut(dropzone, group, files[0], createCart, cart, useMetadata); } }; @@ -171,7 +175,7 @@ Rivendell.Importer.prototype.importFileUploadError = function(dropzone, file, ms dropzone.disable(); }; -Rivendell.Importer.prototype.importAddCut = function(dropzone, group, file, createCart, cart) { +Rivendell.Importer.prototype.importAddCut = function(dropzone, group, file, createCart, cart, useMetadata) { rivendell.addAndEditCut(cart.number, {DESCRIPTION: file.name}, function(cutXml) { group.fetchCarts(); dropzone.on('sending', function(file, xhr, formData) { @@ -194,7 +198,11 @@ Rivendell.Importer.prototype.importAddCut = function(dropzone, group, file, crea formData.append('CHANNELS', 2); formData.append('NORMALIZATION_LEVEL', cart.normlevel); formData.append('AUTOTRIM_LEVEL', cart.trimlevel); - formData.append('USE_METADATA', 0); // don't set USE_METADATA 1 for jingles + if (useMetadata) { + formData.append('USE_METADATA', 1); + } else { + formData.append('USE_METADATA', 0); + } }); dropzone.processQueue(); }).fail(function(xhr, status, err) { |