SAAS-948 - ShowBuilder redesign editors and fixes
This commit is contained in:
parent
ba90b1f1eb
commit
59d89b0b9e
16 changed files with 2048 additions and 236 deletions
|
@ -316,7 +316,7 @@ var AIRTIME = (function(AIRTIME){
|
|||
|
||||
mod.fnAdd = function(aMediaIds, aSchedIds) {
|
||||
mod.disableUI();
|
||||
|
||||
|
||||
$.post(baseUrl+"showbuilder/schedule-add",
|
||||
{"format": "json", "mediaIds": aMediaIds, "schedIds": aSchedIds},
|
||||
mod.fnItemCallback
|
||||
|
|
|
@ -305,13 +305,6 @@ var AIRTIME = (function(AIRTIME){
|
|||
|
||||
mod.fnAdd = function(aMediaIds, aSchedIds) {
|
||||
mod.disableUI();
|
||||
for (var i in aSchedIds) {
|
||||
if ($("#"+aSchedIds[i].id).hasClass("sb-past")) {
|
||||
alert($.i18n._("Cannot add media before currently playing track."));
|
||||
mod.enableUI();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
$.post(baseUrl+"showbuilder/schedule-add",
|
||||
{"format": "json", "mediaIds": aMediaIds, "schedIds": aSchedIds},
|
||||
|
@ -381,7 +374,7 @@ var AIRTIME = (function(AIRTIME){
|
|||
"url": sSource,
|
||||
"data": aoData,
|
||||
"success": function(json) {
|
||||
mod.updateCalendarStatusIcon(json)
|
||||
mod.updateCalendarStatusIcon(json);
|
||||
mod.setTimestamp(json.timestamp);
|
||||
mod.setShowInstances(json.instances);
|
||||
mod.getSelectedCursors();
|
||||
|
@ -402,7 +395,7 @@ var AIRTIME = (function(AIRTIME){
|
|||
|
||||
mod.builderDataTable = function() {
|
||||
$sbContent = $('#show_builder');
|
||||
$lib = $("#library_content"),
|
||||
$lib = $("#library_content");
|
||||
$sbTable = $sbContent.find('table');
|
||||
var isInitialized = false;
|
||||
|
||||
|
|
|
@ -144,8 +144,27 @@ AIRTIME = (function(AIRTIME) {
|
|||
}
|
||||
|
||||
mod.onReady = function() {
|
||||
// Normally we would just use audio/*, but it includes file types that we can't handle (like .m4a)
|
||||
var acceptedTypes = ["audio/ogg",
|
||||
"application/ogg",
|
||||
"audio/vorbis",
|
||||
"audio/mp3",
|
||||
"audio/mpeg",
|
||||
"audio/mpeg3",
|
||||
"audio/x-aac",
|
||||
"audio/aac",
|
||||
"audio/aacp",
|
||||
"audio/mp4",
|
||||
"audio/x-flac",
|
||||
"audio/wav",
|
||||
"audio/x-wav",
|
||||
"audio/mp2",
|
||||
"audio/mp1",
|
||||
"audio/x-ms-wma",
|
||||
"audio/basic"];
|
||||
|
||||
Dropzone.options.uploadForm = {
|
||||
acceptedFiles: acceptedTypes.join(),
|
||||
init: function () {
|
||||
this.on("sending", function (file, xhr, data) {
|
||||
data.append("csrf_token", $("#csrf").val());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue