From 29edfbd6f02213969d22d3af3537fa51671bd248 Mon Sep 17 00:00:00 2001 From: Neil Stoddard Date: Fri, 12 Feb 2016 18:04:33 -0600 Subject: [PATCH 1/2] Register calendar before initialize Client code can define hooks for fullCalendar in the options that can be called during initialization. For example if a caller specifies "viewRender" and inside viewRender they would like to access the calendar object, this isn't possible since the uiCalendarConfig is not yet configured. By adding the new calendar to uiCalendarConfig before calling fullCalendar(options) this allows this functionality. --- src/calendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calendar.js b/src/calendar.js index 181dd88..778dec1 100644 --- a/src/calendar.js +++ b/src/calendar.js @@ -262,10 +262,10 @@ angular.module('ui.calendar', []) if (!calendar) { calendar = angular.element(elm).html(''); } - calendar.fullCalendar(options); if(attrs.calendar) { uiCalendarConfig.calendars[attrs.calendar] = calendar; } + calendar.fullCalendar(options); }; scope.$on('$destroy', function() { scope.destroyCalendar(); From 3a0c4af923fd65e7c9df552bb9030049cd0dba57 Mon Sep 17 00:00:00 2001 From: Neil Stoddard Date: Tue, 12 Apr 2016 10:50:27 -0500 Subject: [PATCH 2/2] Update angular dependency --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index ac7b586..b268f82 100644 --- a/bower.json +++ b/bower.json @@ -16,7 +16,7 @@ "package.json" ], "dependencies": { - "angular": "~1.4.1", + "angular": "~1.5.0", "jquery": "~2.1.4", "fullcalendar": "~2.3.2", "moment": "~2.10.3"