瀏覽代碼

don't throw error if event's title is blank or null

Adam Shaw 12 年之前
父節點
當前提交
d3308c8e59
共有 3 個文件被更改,包括 71 次插入2 次删除
  1. 1 1
      src/agenda/AgendaEventRenderer.js
  2. 3 1
      src/common/DayEventRenderer.js
  3. 67 0
      tests/no_event_titles.html

+ 1 - 1
src/agenda/AgendaEventRenderer.js

@@ -339,7 +339,7 @@ function AgendaEventRenderer() {
 			htmlEscape(formatDates(event.start, event.end, opt('timeFormat'))) +
 			"</div>" +
 			"<div class='fc-event-title'>" +
-			htmlEscape(event.title) +
+			htmlEscape(event.title || '') +
 			"</div>" +
 			"</div>" +
 			"<div class='fc-event-bg'></div>";

+ 3 - 1
src/common/DayEventRenderer.js

@@ -283,7 +283,9 @@ function DayEventRenderer() {
 				"</span>";
 		}
 		html +=
-			"<span class='fc-event-title'>" + htmlEscape(event.title) + "</span>" +
+			"<span class='fc-event-title'>" +
+			htmlEscape(event.title || '') +
+			"</span>" +
 			"</div>";
 		if (segment.isEnd && isEventResizable(event)) {
 			html +=

+ 67 - 0
tests/no_event_titles.html

@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link href='../build/out/fullcalendar.css' rel='stylesheet' />
+<link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
+<script src='../build/out/jquery.js'></script>
+<script src='../build/out/jquery-ui.js'></script>
+<script src='../build/out/fullcalendar.js'></script>
+<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'
+			},
+			editable: true,
+			events: [
+				{
+					title: null,
+					start: new Date(y, m, 1)
+				},
+				{
+					title: '',
+					start: new Date(y, m, d-5),
+					end: new Date(y, m, d-2)
+				},
+				{
+					start: new Date(y, m, d, 10, 30),
+					allDay: false
+				}
+			],
+			eventRender: function(event, el) {
+				el.find('.fc-event-title').text("something");
+			}
+		});
+		
+	});
+
+</script>
+<style>
+
+	body {
+		margin-top: 40px;
+		text-align: center;
+		font-size: 13px;
+		font-family: "Lucida Grande",Helvetica,Arial,Verdana,sans-serif;
+		}
+
+	#calendar {
+		width: 900px;
+		margin: 0 auto;
+		}
+
+</style>
+</head>
+<body>
+<div id='calendar'></div>
+</body>
+</html>