diff --git a/application/controllers/ScheduleController.php b/application/controllers/ScheduleController.php index 0678fa2e7..d3df6f232 100644 --- a/application/controllers/ScheduleController.php +++ b/application/controllers/ScheduleController.php @@ -34,7 +34,7 @@ class ScheduleController extends Zend_Controller_Action { $this->view->headScript()->appendFile('/js/contextmenu/jjmenu.js','text/javascript'); $this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.js','text/javascript'); - $this->view->headScript()->appendFile('/js/fullcalendar/fullcalendar.min.js','text/javascript'); + $this->view->headScript()->appendFile('/js/fullcalendar/fullcalendar.js','text/javascript'); $this->view->headScript()->appendFile('/js/timepicker/jquery.ui.timepicker-0.0.6.js','text/javascript'); $this->view->headScript()->appendFile('/js/colorpicker/js/colorpicker.js','text/javascript'); $this->view->headScript()->appendFile('/js/airtime/schedule/full-calendar-functions.js','text/javascript'); diff --git a/public/js/fullcalendar/fullcalendar.js b/public/js/fullcalendar/fullcalendar.js index cef3dd5e6..313c97839 100644 --- a/public/js/fullcalendar/fullcalendar.js +++ b/public/js/fullcalendar/fullcalendar.js @@ -2945,7 +2945,8 @@ function AgendaEventRenderer() { "" + htmlEscape(formatDates(event.start, event.end, opt('timeFormat'))) + "" + "" + htmlEscape(event.title) + "" + "" + - ((event.editable || event.editable === undefined && opt('editable')) && !opt('disableResizing') && $.fn.resizable ? + ((event.editable || event.editable === undefined && opt('editable')) && + (!event.disableResizing || event.disableResizing === undefined && !opt('disableResizing')) && $.fn.resizable ? "
=
" : '') + ""; @@ -3178,7 +3179,7 @@ function AgendaEventRenderer() { function resizableSlotEvent(event, eventElement, timeElement) { - if (!opt('disableResizing') && eventElement.resizable) { + if ((!event.disableResizing || event.disableResizing === undefined && !opt('disableResizing')) && eventElement.resizable) { var slotDelta, prevSlotDelta; var slotHeight = getSlotHeight(); eventElement.resizable({ @@ -3641,7 +3642,8 @@ function DayEventRenderer() { :'') + "" + htmlEscape(event.title) + "" + "" + - (seg.isEnd && (event.editable || event.editable === undefined && opt('editable')) && !opt('disableResizing') ? + (seg.isEnd && (event.editable || event.editable === undefined && opt('editable')) && + (!event.disableResizing || event.disableResizing === undefined && !opt('disableResizing')) ? "
" : '') + ""; @@ -3831,7 +3833,7 @@ function DayEventRenderer() { function resizableDayEvent(event, element, seg) { - if (!opt('disableResizing') && seg.isEnd) { + if ((!event.disableResizing || event.disableResizing === undefined && !opt('disableResizing')) && seg.isEnd) { var rtl = opt('isRTL'); var direction = rtl ? 'w' : 'e'; var handle = element.find('div.ui-resizable-' + direction); @@ -4806,5 +4808,5 @@ function enableTextSelection(element) { */ - -})(jQuery); \ No newline at end of file + +})(jQuery);