fullcalendar-rails 2.0.1.0 → 2.0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fa0fdf42fe02f3c67dbe026cfa47b54406bd8c3
-  data.tar.gz: fb4675d0dccd346565ea5520c0b7c7079e3e066e
+  metadata.gz: 2b0ae3ec2d5afa8adf8aed5c04a8c244ef4437c6
+  data.tar.gz: c3067afd6f042586f32724aa0ce94d552ddbcfb8
 SHA512:
-  metadata.gz: 7275c96c7951c3f9ee80487c2ea938ac9c747c842339a2da734dda07ecb84a7788d80446d777ed4234450337db9356df88382565855f466aa2e68c63691e51ed
-  data.tar.gz: 51a9629b8fdfe32729b50f94c072bb4ccccbb5a62e410bceab02e26cabbd4eb1d5c59562e7e2f10b36c394eb0b50383754a4708aac1db1a8a27728c181214ce1
+  metadata.gz: cdf65c537286e3467ab9a8fd3acfaf040c599d93eda4f4ef4936884e261003a680e837420b64231b70279a5636da0673191af13e1375c90bf3c8dcc8f2ce459f
+  data.tar.gz: 43d5914f669c28d683f2e7307b46761049af0641e08ec0a570bf1c55fc0d145a3a5ff6a21dc890341473518e8bf6113950914c9a3fc0683693a8f97cdf963070

data/lib/fullcalendar-rails/version.rb

@@ -1,5 +1,5 @@
 module Fullcalendar
   module Rails
-    VERSION = "2.0.1.0"
+    VERSION = "2.0.2.0"
   end
 end

data/vendor/assets/javascripts/fullcalendar.js

@@ -1,5 +1,5 @@
 /*!
- * FullCalendar v2.0.1
+ * FullCalendar v2.0.2
  * Docs & License: http://arshaw.com/fullcalendar/
  * (c) 2013 Adam Shaw
  */
@@ -168,7 +168,7 @@ var rtlDefaults = {
 
 ;;
 
-var fc = $.fullCalendar = { version: "2.0.1" };
+var fc = $.fullCalendar = { version: "2.0.2" };
 var fcViews = fc.views = {};
 
 
@@ -1336,11 +1336,21 @@ function EventManager(options) { // assumed to be a calendar
 	
 	function fetchEventSource(source, fetchID) {
 		_fetchEventSource(source, function(events) {
+			var isArraySource = $.isArray(source.events);
+			var i;
+			var event;
+
 			if (fetchID == currentFetchID) {
 
 				if (events) {
-					for (var i=0; i<events.length; i++) {
-						var event = buildEvent(events[i], source);
+					for (i=0; i<events.length; i++) {
+						event = events[i];
+
+						// event array sources have already been convert to Event Objects
+						if (!isArraySource) {
+							event = buildEvent(event, source);
+						}
+
 						if (event) {
 							cache.push(event);
 						}
@@ -1474,6 +1484,7 @@ function EventManager(options) { // assumed to be a calendar
 	function addEventSource(sourceInput) {
 		var source = buildEventSource(sourceInput);
 		if (source) {
+			sources.push(source);
 			pendingSourceCnt++;
 			fetchEventSource(source, currentFetchID); // will eventually call reportEvents
 		}
@@ -1501,6 +1512,14 @@ function EventManager(options) { // assumed to be a calendar
 		}
 
 		if (source) {
+
+			// for array sources, we convert to standard Event Objects up front
+			if ($.isArray(source.events)) {
+				source.events = $.map(source.events, function(eventInput) {
+					return buildEvent(eventInput, source);
+				});
+			}
+
 			for (i=0; i<normalizers.length; i++) {
 				normalizers[i].call(t, source);
 			}
@@ -1599,30 +1618,31 @@ function EventManager(options) { // assumed to be a calendar
 	
 	
 	function removeEvents(filter) {
+		var eventID;
 		var i;
-		if (!filter) { // remove all
-			cache = [];
-			// clear all array sources
-			for (i=0; i<sources.length; i++) {
-				if ($.isArray(sources[i].events)) {
-					sources[i].events = [];
-				}
-			}
-		}else{
-			if (!$.isFunction(filter)) { // an event ID
-				var id = filter + '';
-				filter = function(e) {
-					return e._id == id;
-				};
-			}
-			cache = $.grep(cache, filter, true);
-			// remove events from array sources
-			for (i=0; i<sources.length; i++) {
-				if ($.isArray(sources[i].events)) {
-					sources[i].events = $.grep(sources[i].events, filter, true);
-				}
+
+		if (filter == null) { // null or undefined. remove all events
+			filter = function() { return true; }; // will always match
+		}
+		else if (!$.isFunction(filter)) { // an event ID
+			eventID = filter + '';
+			filter = function(event) {
+				return event._id == eventID;
+			};
+		}
+
+		// Purge event(s) from our local cache
+		cache = $.grep(cache, filter, true); // inverse=true
+
+		// Remove events from array sources.
+		// This works because they have been converted to official Event Objects up front.
+		// (and as a result, event._id has been calculated).
+		for (i=0; i<sources.length; i++) {
+			if ($.isArray(sources[i].events)) {
+				sources[i].events = $.grep(sources[i].events, filter, true);
 			}
 		}
+
 		reportEvents(cache);
 	}
 	
@@ -1631,7 +1651,7 @@ function EventManager(options) { // assumed to be a calendar
 		if ($.isFunction(filter)) {
 			return $.grep(cache, filter);
 		}
-		else if (filter) { // an event ID
+		else if (filter != null) { // not null, not undefined. an event ID
 			filter += '';
 			return $.grep(cache, function(e) {
 				return e._id == filter;

data/vendor/assets/javascripts/gcal.js

@@ -1,5 +1,5 @@
 /*!
- * FullCalendar v2.0.1 Google Calendar Plugin
+ * FullCalendar v2.0.2 Google Calendar Plugin
  * Docs & License: http://arshaw.com/fullcalendar/
  * (c) 2013 Adam Shaw
  */

data/vendor/assets/stylesheets/fullcalendar.css

@@ -1,5 +1,5 @@
 /*!
- * FullCalendar v2.0.1 Stylesheet
+ * FullCalendar v2.0.2 Stylesheet
  * Docs & License: http://arshaw.com/fullcalendar/
  * (c) 2013 Adam Shaw
  */

data/vendor/assets/stylesheets/fullcalendar.print.css

@@ -1,5 +1,5 @@
 /*!
- * FullCalendar v2.0.1 Print Stylesheet
+ * FullCalendar v2.0.2 Print Stylesheet
  * Docs & License: http://arshaw.com/fullcalendar/
  * (c) 2013 Adam Shaw
  */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullcalendar-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.1.0
+  version: 2.0.2.0
 platform: ruby
 authors:
 - bokmann