app/assets/javascripts/social_stream/fullcalendar.js in social_stream-events-2.0.0.beta2 vs app/assets/javascripts/social_stream/fullcalendar.js in social_stream-events-2.0.0.beta3

- old
+ new

@@ -28,11 +28,12 @@ right: 'month,agendaWeek,agendaDay' }, ignoreTimezone: false, firstDay: 1, eventColor: eventColor, - events: getEvents + events: getEvents, + eventClick: eventClick }; if (calendar.attr('data-can-create')) { $.extend(options, { selectable: true, @@ -77,11 +78,11 @@ getFormEl().modal('show'); }; var getEvents = function(start, end, callback) { $.ajax({ - url: getCalendarEl().attr('data-events-path'), + url: getCalendarEl().attr('data-events_path'), dataType: 'json', data: { // our hypothetical feed requires UNIX timestamps start: Math.round(start.getTime() / 1000), end: Math.round(end.getTime() / 1000) @@ -114,9 +115,20 @@ var form = getFormEl(); form.find('#event_title').val(''); form.find('#event_description').val(''); Scheduler.form.reset(form.find('.scheduler_form')); + }; + + // After clicking an event a modal is shown + var eventClick = function(e) { + $.ajax({ + url: getCalendarEl().attr('data-events_path') + '/' + e.id, + dataType: 'html', + success: function(data) { + $(data).modal(); + } + }); }; callback.register('show', initFullCalendar, initFormModal,