From 2cc786e44581808f4117ad40b620c1a20de81fd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Krienb=C3=BChl?= Date: Wed, 20 Apr 2016 10:32:42 +0200 Subject: [PATCH] Properly pass on event data to rc-* events --- onegov/town/assets/js/reservationcalendar.jsx | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/onegov/town/assets/js/reservationcalendar.jsx b/onegov/town/assets/js/reservationcalendar.jsx index 2fe873c..6f316d4 100644 --- a/onegov/town/assets/js/reservationcalendar.jsx +++ b/onegov/town/assets/js/reservationcalendar.jsx @@ -276,8 +276,8 @@ rc.onPopupOpen = function(calendar) { // pass all reservationcalendar events to the window _.each(rc.events, function(eventName) { - links.on(eventName, _.debounce(function(data) { - $(calendar).trigger(eventName, data); + links.on(eventName, _.debounce(function(_e, data) { + $(calendar).trigger(eventName, [data, calendar]); })); }); }; @@ -338,21 +338,18 @@ rc.setupReservationSelect = function(fcOptions) { .insertBefore(view); calendar.fullCalendar('option', 'aspectRatio', 1.1415926); - rc.resizeReservationSelection(selection); - rc.renderReservationSelection(selection.get(0), calendar, []); - - $(calendar).on('rc-reservation-error', function(_e, _data) { + calendar.on('rc-reservation-error', function() { }); - $(calendar).on('rc-reservations-changed', function() { + calendar.on('rc-reservations-changed', function() { $.getJSON(fcOptions.reservations, function(reservations) { rc.renderReservationSelection(selection.get(0), calendar, reservations); }); }); - $(calendar).trigger('rc-reservations-changed'); - + rc.resizeReservationSelection(selection); + calendar.trigger('rc-reservations-changed'); }); fcOptions.windowResize = function() {