- Fixed issue where Calendar wanted to jump to startposition, while n…

…o context object is available resulting in calendar not being rendered
mendixlabs · Jun 17, 2015 · 3f790df · 3f790df
1 parent 520ba8d
commit 3f790df
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/calendar/widget/calendar.js b/src/calendar/widget/calendar.js
@@ -81,13 +81,19 @@ require({
 
 		startup: function () {
 			console.debug('Calendar - startup');
+
+			if(this._hasStarted) {
+				return;	
+			}
+			this._hasStarted = true;
+
 			//make a calendarbox
 			this._calendarBox = dom.create('div', {
 				'id': 'calendar_' + this.id
 			});
 			domConstruct.place(this._calendarBox, this.domNode);
 
-			this._fcNode = $('#calendar_' + this.id);
+			this._fcNode = $(this._calendarBox);
 
 			this._renderCalendar(null);
 		},
@@ -355,7 +361,7 @@ require({
 
 			this._fcNode.fullCalendar(options);
 
-			if (this._mxObj.get(this.startPos)) {
+			if (this._mxObj && this._mxObj.get(this.startPos)) {
 				this._fcNode.fullCalendar('gotoDate', new Date(this._mxObj.get(this.startPos)));
 			}
 			else {

diff --git a/test/Widgets/Calendar.mpk b/test/Widgets/Calendar.mpk
diff --git a/test/[Test] Calendar Widget.mpr b/test/[Test] Calendar Widget.mpr