Merge branch 'master' of https://github.com/axelduch/fullcalendar into next-release

src.json

@@ -25,6 +25,8 @@
     "common/TimeGrid.events.js",
     "common/View.js",
     "common/Scroller.js",
+    "common/Iterator.js",
+    "Toolbar.js",
     "Calendar.js",
     "Calendar.options.js",
     "defaults.js",

src/Calendar.js

@@ -9,6 +9,7 @@ var Calendar = FC.Calendar = Class.extend({
 	viewSpecCache: null, // cache of view definitions
 	view: null, // current View object
 	header: null,
+	footer: null,
 	loadingLevel: 0, // number of simultaneous loading tasks
 
 
@@ -483,7 +484,7 @@ function Calendar_constructor(element, overrides) {
 	};
 
 
-	
+
 	// Imports
 	// -----------------------------------------------------------------------------------
 
@@ -500,7 +501,9 @@ function Calendar_constructor(element, overrides) {
 
 
 	var _element = element[0];
+	var toolbarsManager;
 	var header;
+	var footer;
 	var content;
 	var tm; // for making theme classes
 	var currentView; // NOTE: keep this in sync with this.view
@@ -510,9 +513,9 @@ function Calendar_constructor(element, overrides) {
 	var ignoreWindowResize = 0;
 	var events = [];
 	var date; // unzoned
-	
-	
-	
+
+
+
 	// Main Rendering
 	// -----------------------------------------------------------------------------------
 
@@ -524,8 +527,8 @@ function Calendar_constructor(element, overrides) {
 	else {
 		date = t.getNow(); // getNow already returns unzoned
 	}
-	
-	
+
+
 	function render() {
 		if (!content) {
 			initialRender();
@@ -536,8 +539,8 @@ function Calendar_constructor(element, overrides) {
 			renderView();
 		}
 	}
-	
-	
+
+
 	function initialRender() {
 		element.addClass('fc');
 
@@ -578,9 +581,14 @@ function Calendar_constructor(element, overrides) {
 
 		content = $("<div class='fc-view-container'/>").prependTo(element);
 
-		header = t.header = new Header(t);
-		renderHeader();
+		var toolbars = buildToolbars();
+		toolbarsManager = new Iterator(toolbars);
+
+		header = t.header = toolbars[0];
+		footer = t.footer = toolbars[1];
 
+		renderHeader();
+		renderFooter();
 		renderView(t.options.defaultView);
 
 		if (t.options.handleWindowResize) {
@@ -590,15 +598,50 @@ function Calendar_constructor(element, overrides) {
 	}
 
 
+	function buildToolbars() {
+		return [
+			new Toolbar(t, computeHeaderOptions()),
+			new Toolbar(t, computeFooterOptions())
+		];
+	}
+
+
+	function computeHeaderOptions() {
+		return {
+			extraClasses: 'fc-header-toolbar',
+			layout: t.options.header
+		};
+	}
+
+
+	function computeFooterOptions() {
+		return {
+			extraClasses: 'fc-footer-toolbar',
+			layout: t.options.footer
+		};
+	}
+
+
 	// can be called repeatedly and Header will rerender
 	function renderHeader() {
+		header.setToolbarOptions(computeHeaderOptions());
 		header.render();
 		if (header.el) {
 			element.prepend(header.el);
 		}
 	}
-	
-	
+
+
+	// can be called repeatedly and Footer will rerender
+	function renderFooter() {
+		footer.setToolbarOptions(computeFooterOptions());
+		footer.render();
+		if (footer.el) {
+			element.append(footer.el);
+		}
+	}
+
+
 	function destroy() {
 
 		if (currentView) {
@@ -608,7 +651,7 @@ function Calendar_constructor(element, overrides) {
 			// It is still the "current" view, just not rendered.
 		}
 
-		header.removeElement();
+		toolbarsManager.proxyCall('removeElement');
 		content.remove();
 		element.removeClass('fc fc-ltr fc-rtl fc-unthemed ui-widget');
 
@@ -618,13 +661,13 @@ function Calendar_constructor(element, overrides) {
 			$(window).unbind('resize', windowResizeProxy);
 		}
 	}
-	
-	
+
+
 	function elementVisible() {
 		return element.is(':visible');
 	}
-	
-	
+
+
 
 	// View Rendering
 	// -----------------------------------------------------------------------------------
@@ -651,7 +694,7 @@ function Calendar_constructor(element, overrides) {
 			currentView.setElement(
 				$("<div class='fc-view fc-" + viewType + "-view' />").appendTo(content)
 			);
-			header.activateButton(viewType);
+			toolbarsManager.proxyCall('activateButton', viewType);
 		}
 
 		if (currentView) {
@@ -673,8 +716,8 @@ function Calendar_constructor(element, overrides) {
 					unfreezeContentHeight(); // immediately unfreeze regardless of whether display is async
 
 					// need to do this after View::render, so dates are calculated
-					updateHeaderTitle();
-					updateTodayButton();
+					updateToolbarsTitle();
+					updateToolbarsTodayButton();
 
 					getAndRenderEvents();
 				}
@@ -689,7 +732,7 @@ function Calendar_constructor(element, overrides) {
 	// Unrenders the current view and reflects this change in the Header.
 	// Unregsiters the `currentView`, but does not remove from viewByType hash.
 	function clearView() {
-		header.deactivateButton(currentView.type);
+		toolbarsManager.proxyCall('deactivateButton', currentView.type);
 		currentView.removeElement();
 		currentView = t.view = null;
 	}
@@ -711,7 +754,7 @@ function Calendar_constructor(element, overrides) {
 		ignoreWindowResize--;
 	}
 
-	
+
 
 	// Resizing
 	// -----------------------------------------------------------------------------------
@@ -728,8 +771,8 @@ function Calendar_constructor(element, overrides) {
 	t.isHeightAuto = function() {
 		return t.options.contentHeight === 'auto' || t.options.height === 'auto';
 	};
-	
-	
+
+
 	function updateSize(shouldRecalc) {
 		if (elementVisible()) {
 
@@ -751,8 +794,8 @@ function Calendar_constructor(element, overrides) {
 			_calcSize();
 		}
 	}
-	
-	
+
+
 	function _calcSize() { // assumes elementVisible
 		var contentHeightInput = t.options.contentHeight;
 		var heightInput = t.options.height;
@@ -764,13 +807,13 @@ function Calendar_constructor(element, overrides) {
 			suggestedViewHeight = contentHeightInput();
 		}
 		else if (typeof heightInput === 'number') { // exists and not 'auto'
-			suggestedViewHeight = heightInput - queryHeaderHeight();
+			suggestedViewHeight = heightInput - queryToolbarsHeight();
 		}
 		else if (typeof heightInput === 'function') { // exists and is a function
-			suggestedViewHeight = heightInput() - queryHeaderHeight();
+			suggestedViewHeight = heightInput() - queryToolbarsHeight();
 		}
 		else if (heightInput === 'parent') { // set to height of parent element
-			suggestedViewHeight = element.parent().height() - queryHeaderHeight();
+			suggestedViewHeight = element.parent().height() - queryToolbarsHeight();
 		}
 		else {
 			suggestedViewHeight = Math.round(content.width() / Math.max(t.options.aspectRatio, .5));
@@ -778,11 +821,14 @@ function Calendar_constructor(element, overrides) {
 	}
 
 
-	function queryHeaderHeight() {
-		return header.el ? header.el.outerHeight(true) : 0; // includes margin
+	function queryToolbarsHeight() {
+		return toolbarsManager.items.reduce(function(accumulator, toolbar) {
+			var toolbarHeight = toolbar.el ? toolbar.el.outerHeight(true) : 0; // includes margin
+			return accumulator + toolbarHeight;
+		}, 0);
 	}
-	
-	
+
+
 	function windowResize(ev) {
 		if (
 			!ignoreWindowResize &&
@@ -794,9 +840,9 @@ function Calendar_constructor(element, overrides) {
 			}
 		}
 	}
-	
-	
-	
+
+
+
 	/* Event Fetching/Rendering
 	-----------------------------------------------------------------------------*/
 	// TODO: going forward, most of this stuff should be directly handled by the view
@@ -820,7 +866,7 @@ function Calendar_constructor(element, overrides) {
 			unfreezeContentHeight();
 		}
 	}
-	
+
 
 	function getAndRenderEvents() {
 		if (!t.options.lazyFetching || isFetchNeeded(currentView.start, currentView.end)) {
@@ -838,7 +884,7 @@ function Calendar_constructor(element, overrides) {
 			// ... which will call renderEvents
 	}
 
-	
+
 	// called when event data arrives
 	function reportEvents(_events) {
 		events = _events;
@@ -853,31 +899,30 @@ function Calendar_constructor(element, overrides) {
 
 
 
-	/* Header Updating
+	/* Toolbars Updating
 	-----------------------------------------------------------------------------*/
 
 
-	function updateHeaderTitle() {
-		header.updateTitle(currentView.title);
+	function updateToolbarsTitle() {
+		toolbarsManager.proxyCall('updateTitle', currentView.title);
 	}
 
 
-	function updateTodayButton() {
+	function updateToolbarsTodayButton() {
 		var now = t.getNow();
-
 		if (now >= currentView.intervalStart && now < currentView.intervalEnd) {
-			header.disableButton('today');
+			toolbarsManager.proxyCall('disableButton', 'today');
 		}
 		else {
-			header.enableButton('today');
+			toolbarsManager.proxyCall('enableButton', 'today');
 		}
 	}
-	
+
 
 
 	/* Selection
 	-----------------------------------------------------------------------------*/
-	
+
 
 	// this public method receives start/end dates in any format, with any timezone
 	function select(zonedStartInput, zonedEndInput) {
@@ -885,56 +930,56 @@ function Calendar_constructor(element, overrides) {
 			t.buildSelectSpan.apply(t, arguments)
 		);
 	}
-	
+
 
 	function unselect() { // safe to be called before renderView
 		if (currentView) {
 			currentView.unselect();
 		}
 	}
-	
-	
-	
+
+
+
 	/* Date
 	-----------------------------------------------------------------------------*/
-	
-	
+
+
 	function prev() {
 		date = currentView.computePrevDate(date);
 		renderView();
 	}
-	
-	
+
+
 	function next() {
 		date = currentView.computeNextDate(date);
 		renderView();
 	}
-	
-	
+
+
 	function prevYear() {
 		date.add(-1, 'years');
 		renderView();
 	}
-	
-	
+
+
 	function nextYear() {
 		date.add(1, 'years');
 		renderView();
 	}
-	
-	
+
+
 	function today() {
 		date = t.getNow();
 		renderView();
 	}
-	
-	
+
+
 	function gotoDate(zonedDateInput) {
 		date = t.moment(zonedDateInput).stripZone();
 		renderView();
 	}
-	
-	
+
+
 	function incrementDate(delta) {
 		date.add(moment.duration(delta));
 		renderView();
@@ -952,8 +997,8 @@ function Calendar_constructor(element, overrides) {
 		date = newDate.clone();
 		renderView(spec ? spec.type : null);
 	}
-	
-	
+
+
 	// for external API
 	function getDate() {
 		return t.applyTimezone(date); // infuse the calendar's timezone
@@ -985,23 +1030,23 @@ function Calendar_constructor(element, overrides) {
 			overflow: ''
 		});
 	}
-	
-	
-	
+
+
+
 	/* Misc
 	-----------------------------------------------------------------------------*/
-	
+
 
 	function getCalendar() {
 		return t;
 	}
 
-	
+
 	function getView() {
 		return currentView;
 	}
-	
-	
+
+
 	function option(name, value) {
 		var newOptionHash;
 
@@ -1062,13 +1107,14 @@ function Calendar_constructor(element, overrides) {
 			}
 		}
 
-		// catch-all. rerender the header and rebuild/rerender the current view
+		// catch-all. rerender the header and footer and rebuild/rerender the current view
 		renderHeader();
+		renderFooter();
 		viewsByType = {}; // even non-current views will be affected by this option change. do before rerender
 		reinitView();
 	}
-	
-	
+
+
 	function trigger(name, thisObj) { // overrides the Emitter's trigger method :(
 		var args = Array.prototype.slice.call(arguments, 2);
 

src/Header.js → src/Toolbar.js

@@ -1,12 +1,12 @@
 
-/* Top toolbar area with buttons and title
+/* Toolbar with buttons and title
 ----------------------------------------------------------------------------------------------------------------------*/
-// TODO: rename all header-related things to "toolbar"
 
-function Header(calendar) {
+function Toolbar(calendar, toolbarOptions) {
 	var t = this;
-	
+
 	// exports
+	t.setToolbarOptions = setToolbarOptions;
 	t.render = render;
 	t.removeElement = removeElement;
 	t.updateTitle = updateTitle;
@@ -16,23 +16,25 @@ function Header(calendar) {
 	t.enableButton = enableButton;
 	t.getViewsWithButtons = getViewsWithButtons;
 	t.el = null; // mirrors local `el`
-	
+
 	// locals
 	var el;
 	var viewsWithButtons = [];
 	var tm;
 
+	function setToolbarOptions(newToolbarOptions) {
+		toolbarOptions = newToolbarOptions;
+	}
 
 	// can be called repeatedly and will rerender
 	function render() {
-		var options = calendar.options;
-		var sections = options.header;
+		var sections = toolbarOptions.layout;
 
-		tm = options.theme ? 'ui' : 'fc';
+		tm = calendar.options.theme ? 'ui' : 'fc';
 
 		if (sections) {
 			if (!el) {
-				el = this.el = $("<div class='fc-toolbar'/>");
+				el = this.el = $("<div class='fc-toolbar "+ toolbarOptions.extraClasses + "'/>");
 			}
 			else {
 				el.empty();
@@ -46,20 +48,19 @@ function Header(calendar) {
 			removeElement();
 		}
 	}
-	
-	
+
+
 	function removeElement() {
 		if (el) {
 			el.remove();
 			el = t.el = null;
 		}
 	}
-	
-	
+
+
 	function renderSection(position) {
 		var sectionEl = $('<div class="fc-' + position + '"/>');
-		var options = calendar.options;
-		var buttonStr = options.header[position];
+		var buttonStr = toolbarOptions.layout[position];
 
 		if (buttonStr) {
 			$.each(buttonStr.split(' '), function(i) {
@@ -84,7 +85,7 @@ function Header(calendar) {
 						isOnlyButtons = false;
 					}
 					else {
-						if ((customButtonProps = (options.customButtons || {})[buttonName])) {
+						if ((customButtonProps = (calendar.options.customButtons || {})[buttonName])) {
 							buttonClick = function(ev) {
 								if (customButtonProps.click) {
 									customButtonProps.click.call(button[0], ev);
@@ -106,7 +107,7 @@ function Header(calendar) {
 								calendar[buttonName]();
 							};
 							overrideText = (calendar.overrides.buttonText || {})[buttonName];
-							defaultText = options.buttonText[buttonName]; // everything else is considered default
+							defaultText = calendar.options.buttonText[buttonName]; // everything else is considered default
 						}
 
 						if (buttonClick) {
@@ -114,20 +115,20 @@ function Header(calendar) {
 							themeIcon =
 								customButtonProps ?
 									customButtonProps.themeIcon :
-									options.themeButtonIcons[buttonName];
+									calendar.options.themeButtonIcons[buttonName];
 
 							normalIcon =
 								customButtonProps ?
 									customButtonProps.icon :
-									options.buttonIcons[buttonName];
+									calendar.options.buttonIcons[buttonName];
 
 							if (overrideText) {
 								innerHtml = htmlEscape(overrideText);
 							}
-							else if (themeIcon && options.theme) {
+							else if (themeIcon && calendar.options.theme) {
 								innerHtml = "<span class='ui-icon ui-icon-" + themeIcon + "'></span>";
 							}
-							else if (normalIcon && !options.theme) {
+							else if (normalIcon && !calendar.options.theme) {
 								innerHtml = "<span class='fc-icon fc-icon-" + normalIcon + "'></span>";
 							}
 							else {
@@ -217,31 +218,31 @@ function Header(calendar) {
 
 		return sectionEl;
 	}
-	
-	
+
+
 	function updateTitle(text) {
 		if (el) {
 			el.find('h2').text(text);
 		}
 	}
-	
-	
+
+
 	function activateButton(buttonName) {
 		if (el) {
 			el.find('.fc-' + buttonName + '-button')
 				.addClass(tm + '-state-active');
 		}
 	}
-	
-	
+
+
 	function deactivateButton(buttonName) {
 		if (el) {
 			el.find('.fc-' + buttonName + '-button')
 				.removeClass(tm + '-state-active');
 		}
 	}
-	
-	
+
+
 	function disableButton(buttonName) {
 		if (el) {
 			el.find('.fc-' + buttonName + '-button')
@@ -249,8 +250,8 @@ function Header(calendar) {
 				.addClass(tm + '-state-disabled');
 		}
 	}
-	
-	
+
+
 	function enableButton(buttonName) {
 		if (el) {
 			el.find('.fc-' + buttonName + '-button')

src/common/DayGrid.limit.js

@@ -277,7 +277,7 @@ DayGrid.mixin({
 		var isTheme = view.opt('theme');
 		var title = this.getCellDate(row, col).format(view.opt('dayPopoverFormat'));
 		var content = $(
-			'<div class="fc-header ' + view.widgetHeaderClass + '">' +
+			'<div class="fc-header-toolbar ' + view.widgetHeaderClass + '">' +
 				'<span class="fc-close ' +
 					(isTheme ? 'ui-icon ui-icon-closethick' : 'fc-icon fc-icon-x') +
 				'"></span>' +

src/common/Iterator.js

@@ -0,0 +1,16 @@
+function Iterator(items) {
+    this.items = items || [];
+}
+
+
+/* Calls a method on every item passing the arguments through */
+Iterator.prototype.proxyCall = function(methodName) {
+    var args = Array.prototype.slice.call(arguments, 1);
+    var results = [];
+
+    this.items.forEach(function(item) {
+        results.push(item[methodName].apply(item, args));
+    });
+
+    return results;
+};

src/main.css

@@ -4,9 +4,16 @@
 
 .fc-toolbar {
 	text-align: center;
+}
+
+.fc-toolbar.fc-header-toolbar {
 	margin-bottom: 1em;
 }
 
+.fc-toolbar.fc-footer-toolbar {
+	margin-top: 1em;
+}
+
 .fc-toolbar .fc-left {
 	float: left;
 }

src/main.js

@@ -34,13 +34,14 @@ $.fn.fullCalendar = function(options) {
 			calendar.render();
 		}
 	});
-	
+
 	return res;
 };
 
 
 var complexOptions = [ // names of options that are objects whose properties should be combined
 	'header',
+	'footer',
 	'buttonText',
 	'buttonIcons',
 	'themeButtonIcons'

tests/automated/dayPopoverFormat.js

@@ -25,19 +25,19 @@ describe('dayPopoverFormat', function() {
 	it('can be set to a custom value', function() {
 		options.dayPopoverFormat = 'ddd, MMMM';
 		init();
-		expect($('.fc-more-popover > .fc-header .fc-title')).toHaveText('Tue, July');
+		expect($('.fc-more-popover > .fc-header-toolbar .fc-title')).toHaveText('Tue, July');
 	});
 
 	it('is affected by the current locale when the value is default', function() {
 		options.locale = 'fr';
 		init();
-		expect($('.fc-more-popover > .fc-header .fc-title')).toHaveText('29 juillet 2014');
+		expect($('.fc-more-popover > .fc-header-toolbar .fc-title')).toHaveText('29 juillet 2014');
 	});
 
 	it('still maintains the same format when explicitly set, and there is a locale', function() {
 		options.locale = 'fr';
 		options.dayPopoverFormat = 'YYYY';
 		init();
-		expect($('.fc-more-popover > .fc-header .fc-title')).toHaveText('2014');
+		expect($('.fc-more-popover > .fc-header-toolbar .fc-title')).toHaveText('2014');
 	});
 });

tests/automated/eventLimit-popover.js

@@ -189,8 +189,8 @@ describe('eventLimit popover', function() {
 	it('doesn\'t close when user clicks somewhere inside of the popover', function() {
 		init();
 		expect($('.fc-more-popover')).toBeVisible();
-		expect($('.fc-more-popover .fc-header')).toBeInDOM();
-		$('.fc-more-popover .fc-header').simulate('mousedown').simulate('click');
+		expect($('.fc-more-popover .fc-header-toolbar')).toBeInDOM();
+		$('.fc-more-popover .fc-header-toolbar').simulate('mousedown').simulate('click');
 		expect($('.fc-more-popover')).toBeVisible();
 	});
 

tests/automated/footer-navigation.js

@@ -0,0 +1,61 @@
+
+describe('footer navigation', function() {
+
+	beforeEach(function() {
+		affix('#calendar');
+		var options = {
+			footer: {
+				left: 'next,prev,prevYear,nextYear today',
+				center: '',
+				right: 'title'
+			}
+		};
+		$('#calendar').fullCalendar(options);
+	});
+
+	describe('and click next', function() {
+		it('should change view to next month', function() {
+			$('#calendar').fullCalendar('gotoDate', '2010-02-01');
+			$('.fc-footer-toolbar .fc-next-button').simulate('click');
+			var newDate = $('#calendar').fullCalendar('getDate');
+			expect(newDate).toEqualMoment('2010-03-01');
+		});
+	});
+
+	describe('and click prev', function() {
+		it('should change view to prev month', function() {
+			$('#calendar').fullCalendar('gotoDate', '2010-02-01');
+			$('.fc-footer-toolbar .fc-prev-button').simulate('click');
+			var newDate = $('#calendar').fullCalendar('getDate');
+			expect(newDate).toEqualMoment('2010-01-01');
+		});
+	});
+
+	describe('and click prevYear', function() {
+		it('should change view to prev month', function() {
+			$('#calendar').fullCalendar('gotoDate', '2010-02-01');
+			$('.fc-footer-toolbar .fc-prevYear-button').simulate('click');
+			var newDate = $('#calendar').fullCalendar('getDate');
+			expect(newDate).toEqualMoment('2009-02-01');
+		});
+	});
+
+	describe('and click nextYear', function() {
+		it('should change view to prev month', function() {
+			$('#calendar').fullCalendar('gotoDate', '2010-02-01');
+			$('.fc-footer-toolbar .fc-nextYear-button').simulate('click');
+			var newDate = $('#calendar').fullCalendar('getDate');
+			expect(newDate).toEqualMoment('2011-02-01');
+		});
+	});
+
+	describe('and click today', function() {
+		it('should change view to prev month', function() {
+			$('#calendar').fullCalendar('gotoDate', '2010-02-01');
+			$('.fc-footer-toolbar .fc-today-button').simulate('click');
+			var newDate = $('#calendar').fullCalendar('getDate'); // will be ambig zone
+			newDate.local(); // assign the local timezone
+			expect(newDate).toEqualNow();
+		});
+	});
+});

tests/automated/footer-rendering.js

@@ -0,0 +1,51 @@
+
+describe('footer rendering', function() {
+
+	beforeEach(function() {
+		affix('#calendar');
+	});
+
+	describe('when supplying footer options', function() {
+		beforeEach(function() {
+			var options = {
+				footer: {
+					left: 'next,prev',
+					center: 'prevYear today nextYear agendaView,dayView',
+					right: 'title'
+				}
+			};
+			$('#calendar').fullCalendar(options);
+		});
+		it('should append a .fc-footer-toolbar to the DOM', function() {
+			var footer = $('#calendar .fc-footer-toolbar');
+			expect(footer.length).toBe(1);
+		});
+	});
+
+	describe('when setting footer to false', function() {
+		beforeEach(function() {
+			var options = {
+				footer: false
+			};
+			$('#calendar').fullCalendar(options);
+		});
+		it('should not have footer table', function() {
+			expect($('.fc-footer-toolbar')).not.toBeInDOM();
+		});
+	});
+
+	it('allow for dynamically changing', function() {
+		var options = {
+			footer: {
+				left: 'next,prev',
+				center: 'prevYear today nextYear agendaView,dayView',
+				right: 'title'
+			}
+		};
+		$('#calendar').fullCalendar(options);
+		expect($('.fc-footer-toolbar')).toBeInDOM();
+		$('#calendar').fullCalendar('option', 'footer', false);
+		expect($('.fc-footer-toolbar')).not.toBeInDOM();
+	});
+
+});

tests/manual/fullheight.html

@@ -9,18 +9,23 @@
 <script>
 
 	$(document).ready(function() {
-	
+
 		var date = new Date();
 		var d = date.getDate();
 		var m = date.getMonth();
 		var y = date.getFullYear();
-		
+
 		$('#calendar').fullCalendar({
 			header: {
 				left: 'prev,next today',
 				center: 'title',
 				right: 'month,agendaWeek,basicWeek,agendaDay,basicDay'
 			},
+			footer: {
+				left: 'prev,next today',
+				center: 'title',
+				right: 'month,agendaWeek,basicWeek,agendaDay,basicDay'
+			},
 			editable: true,
 			events: [
 				{
@@ -71,7 +76,7 @@
 			fixedWeekCount: false,
 			height: 'parent'
 		});
-		
+
 	});
 
 </script>