Почетна Преглед Помоћ
Пријавите се
javascript
/
fullcalendar
огледало од https://github.com/fullcalendar/fullcalendar.git
2
0
Креирај огранак 0
Датотеке Дискусије 0 Вики
Преглед изворни кода

fixed issues 554, 586, and 616

Adam Shaw пре 15 година
родитељ
82aacbb9d8
комит
453fcf07e3
5 измењених фајлова са 202 додато и 30 уклоњено
Један поглед Покажи статистику Diff
  1. 39 29
      src/EventManager.js
  2. 0 1
      tests/issue_417_refetchEvents.html
  3. 50 0
      tests/issue_554.html
  4. 57 0
      tests/issue_586_refetchEvents.html
  5. 56 0
      tests/issue_616.html

+ 39 - 29
src/EventManager.js
Прегледај датотеку 

@@ -26,6 +26,7 @@ function EventManager(options, eventSources) {
 
 
 
 	
 	
 	// locals
 
 	// locals
 
+	var fetchID = 0;
 
 	var eventStart, eventEnd;
 
 	var eventStart, eventEnd;
 
 	var events = [];
 
 	var events = [];
 
 	var loadingLevel = 0;
 
 	var loadingLevel = 0;
 
@@ -64,45 +65,49 @@ function EventManager(options, eventSources) {
 
 	
 	
 	// Fetch from ALL sources. Clear 'events' array and populate
 
 	// Fetch from ALL sources. Clear 'events' array and populate
 
 	function fetchEvents(callback) {
 
 	function fetchEvents(callback) {
 
-		var view = getView();
 
 		events = [];
 
 		events = [];
 
-		eventStart = cloneDate(view.visStart);
 
-		eventEnd = cloneDate(view.visEnd);
 
-		var queued = eventSources.length,
 
-			sourceDone = function() {
 
+		fetchEventSources(eventSources, callback);
 
+	}
 
+	
+	
+	// appends to the events array
 
+	function fetchEventSources(sources, callback) {
 
+		var savedID = ++fetchID;
 
+		var queued = sources.length;
 
+		var view = getView();
 
+		eventStart = cloneDate(view.visStart); // we don't need to make local copies b/c
 
+		eventEnd = cloneDate(view.visEnd);     //   eventStart/eventEnd is only assigned/manipulated here
 
+		function sourceDone(source, sourceEvents) {
 
+			if (savedID == fetchID && eventStart >= view.visStart && eventEnd <= view.visEnd) {
 
+				// same fetchEventSources call, and still in correct date range
 
+				if ($.inArray(source, eventSources) != -1) { // source hasn't been removed since we started
 
+					for (var i=0; i<sourceEvents.length; i++) {
 
+						normalizeEvent(sourceEvents[i]);
 
+						sourceEvents[i].source = source;
 
+					}
 
+					events = events.concat(sourceEvents);
 
+				}
 
 				if (!--queued) {
 
 				if (!--queued) {
 
 					if (callback) {
 
 					if (callback) {
 
 						callback(events);
 
 						callback(events);
 
 					}
 
 					}
 
 				}
 
 				}
 
-			}, i=0;
 
-		for (; i<eventSources.length; i++) {
 
-			fetchEventSource(eventSources[i], sourceDone);
 
+			}
 
+		}
 
+		for (var i=0; i<sources.length; i++) {
 
+			_fetchEventSource(sources[i], sourceDone);
 
 		}
 
 		}
 
 	}
 
 	}
 
 	
 	
 	
 	
-	// Fetch from a particular source. Append to the 'events' array
 
-	function fetchEventSource(src, callback) {
 
-		var prevView = getView(),
 
-			prevDate = getDate(),
 
-			reportEvents = function(a) {
 
-				if (prevView == getView() && +prevDate == +getDate() && // protects from fast switching
 
-					$.inArray(src, eventSources) != -1) {               // makes sure source hasn't been removed
 
-						for (var i=0; i<a.length; i++) {
 
-							normalizeEvent(a[i]);
 
-							a[i].source = src;
 
-						}
 
-						events = events.concat(a);
 
-						if (callback) {
 
-							callback(a);
 
-						}
 
-					}
 
-			},
 
-			reportEventsAndPop = function(a) {
 
-				reportEvents(a);
 
-				popLoading();
 
-			};
 
+	function _fetchEventSource(src, callback) {
 
+		function reportEvents(a) {
 
+			callback(src, a);
 
+		}
 
+		function reportEventsAndPop(a) {
 
+			reportEvents(a);
 
+			popLoading();
 
+		}
 
 		if (typeof src == 'string') {
 
 		if (typeof src == 'string') {
 
 			var params = {};
 
 			var params = {};
 
 			params[options.startParam] = Math.round(eventStart.getTime() / 1000);
 
 			params[options.startParam] = Math.round(eventStart.getTime() / 1000);
 
@@ -130,6 +135,11 @@ function EventManager(options, eventSources) {
 
 	}
 
 	}
 
 	
 	
 	
 	
+	function fetchEventSource(src, callback) {
 
+		fetchEventSources([src], callback);
 
+	}
 
+	
+	
 	function refetchEvents() {
 
 	function refetchEvents() {
 
 		fetchEvents(rerenderEvents);
 
 		fetchEvents(rerenderEvents);
 
 	}
 
 	}

+ 0 - 1
tests/issue_417_refetchEvents.html
Прегледај датотеку 

@@ -1,7 +1,6 @@
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html>
 
 <html>
 
 <head>
 
 <head>
 
-<link rel='stylesheet' type='text/css' href='../demos/redmond/theme.css' />
 
 <script type='text/javascript' src='../src/_loader.js?debug'></script>
 
 <script type='text/javascript' src='../src/_loader.js?debug'></script>
 
 <script type='text/javascript' src='../src/gcal/_loader.js'></script>
 
 <script type='text/javascript' src='../src/gcal/_loader.js'></script>
 
 <script type='text/javascript'>
 
 <script type='text/javascript'>

+ 50 - 0
tests/issue_554.html
Прегледај датотеку 

@@ -0,0 +1,50 @@
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
+<html>
 
+<head>
 
+<script type='text/javascript' src='../src/_loader.js?debug'></script>
 
+<script type='text/javascript' src='../src/gcal/_loader.js'></script>
 
+<script type='text/javascript'>
 
+
 
+	$(document).ready(function() {
 
+	
+		var date = new Date();
 
+		var d = date.getDate();
 
+		var m = date.getMonth();
 
+		var y = date.getFullYear();
 
+		
+		$('#calendar').fullCalendar({
 
+			year: 2010,
 
+			month: 9,
 
+			date: 31,
 
+			header: {
 
+				left: 'prev,next today',
 
+				center: 'title',
 
+				right: 'month,agendaDay'
 
+			},
 
+			events: $.fullCalendar.gcalFeed('http://www.google.com/calendar/feeds/usa__en%40holiday.calendar.google.com/public/basic')
 
+		});
 
+		
+	});
 
+
 
+</script>
 
+<style type='text/css'>
 
+
 
+	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>
 
+<button onclick="$('#calendar').fullCalendar('gotoDate',2010,10,11);$('#calendar').fullCalendar('changeView','agendaDay')">gotoDate + changeView</button>
 
+<div id='calendar'></div>
 
+</body>
 
+</html>

+ 57 - 0
tests/issue_586_refetchEvents.html
Прегледај датотеку 

@@ -0,0 +1,57 @@
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
+<html>
 
+<head>
 
+<script type='text/javascript' src='../src/_loader.js?debug'></script>
 
+<script type='text/javascript' src='../src/gcal/_loader.js'></script>
 
+<script type='text/javascript'>
 
+
 
+	$(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: $.fullCalendar.gcalFeed('http://www.google.com/calendar/feeds/usa__en%40holiday.calendar.google.com/public/basic')
 
+		});
 
+		
+	});
 
+	
+	function doit() {
 
+		var calendar = $('#calendar');
 
+		calendar.fullCalendar('removeEvents');
 
+		calendar.fullCalendar('refetchEvents');
 
+		calendar.fullCalendar('refetchEvents');
 
+		calendar.fullCalendar('refetchEvents');
 
+		calendar.fullCalendar('refetchEvents');
 
+	}
 
+
 
+</script>
 
+<style type='text/css'>
 
+
 
+	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>
 
+<button onclick='doit()'>do it</button>
 
+<div id='calendar'></div>
 
+</body>
 
+</html>

+ 56 - 0
tests/issue_616.html
Прегледај датотеку 

@@ -0,0 +1,56 @@
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
+<html>
 
+<head>
 
+<script type='text/javascript' src='../src/_loader.js?debug'></script>
 
+<script type='text/javascript' src='../src/gcal/_loader.js'></script>
 
+<script type='text/javascript'>
 
+
 
+	$(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
 
+		});
 
+		
+	});
 
+	
+	
+	function doit() {
 
+		var calendar = $('#calendar');
 
+		var gcal = $.fullCalendar.gcalFeed('http://www.google.com/calendar/feeds/usa__en%40holiday.calendar.google.com/public/basic');
 
+		calendar.fullCalendar('addEventSource', gcal);
 
+		calendar.fullCalendar('refetchEvents');
 
+	}
 
+	
+
 
+</script>
 
+<style type='text/css'>
 
+
 
+	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>
 
+<button onclick='doit()'>do it</button>
 
+<div id='calendar'></div>
 
+</body>
 
+</html>