diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index e59d16751..e9d813e0c 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -1069,13 +1069,13 @@ function buildEditMetadataDialog (json){ width: 460, height: 660, modal: true, - close: closeDialog + close: closeDialogLibrary }); dialog.dialog('open'); } -function closeDialog(event, ui) { +function closeDialogLibrary(event, ui) { $(this).remove(); } diff --git a/airtime_mvc/public/js/airtime/schedule/schedule.js b/airtime_mvc/public/js/airtime/schedule/schedule.js index b313aba74..85f95cd11 100644 --- a/airtime_mvc/public/js/airtime/schedule/schedule.js +++ b/airtime_mvc/public/js/airtime/schedule/schedule.js @@ -12,7 +12,7 @@ var AIRTIME = (function(AIRTIME){ var serverTimezoneOffset = 0; -function closeDialog(event, ui) { +function closeDialogCalendar(event, ui) { $("#schedule_calendar").fullCalendar( 'refetchEvents' ); $(this).remove(); } @@ -161,7 +161,7 @@ function buildScheduleDialog (json, instance_id) { resizable: false, draggable: true, modal: true, - close: closeDialog, + close: closeDialogCalendar, buttons: [ { text: $.i18n._("Ok"), @@ -214,7 +214,7 @@ function buildContentDialog (json){ width: width, height: height, modal: true, - close: closeDialog, + close: closeDialogCalendar, buttons: [ { text: $.i18n._("Ok"), diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 539412fda..af532dea3 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -51,6 +51,14 @@ var AIRTIME = (function(AIRTIME){ var lastElem = json.schedule[json.schedule.length-1]; var $elem = $("#fc-show-instance-"+instance_id); + + //if the show is linked, then replace $elem to reference all linked + //instances + if ($elem.data("show-linked") == "1") { + var show_id = $elem.data("show-id"); + $elem = $('*[data-show-id="'+show_id+'"]'); + } + $elem.find(".show-empty, .show-partial-filled").remove(); if (json.schedule[1].empty) { $elem