Browse Source

start sending eventRanges

Adam Shaw 8 năm trước cách đây
mục cha
commit
107c2f1899
3 tập tin đã thay đổi với 25 bổ sung24 xóa
  1. 4 4
      src/EventManager.js
  2. 5 5
      src/common/ChronoComponent.js
  3. 16 15
      src/common/View.js

+ 4 - 4
src/EventManager.js

@@ -72,7 +72,7 @@ function EventManager() { // assumed to be a calendar
 
 	function reportEventChange() {
 		debugEventDefCollection();
-		t.trigger('eventsReset', cache);
+		t.trigger('eventsReset', eventDefCollection.buildRenderRanges(rangeStart, rangeEnd, t));
 	}
 
 
@@ -149,7 +149,7 @@ function EventManager() { // assumed to be a calendar
 			});
 		}
 		else { // executed all synchronously, or no sources at all
-			return Promise.resolve(cache);
+			return Promise.resolve(eventDefCollection.buildRenderRanges(rangeStart, rangeEnd, t));
 		}
 	}
 
@@ -243,8 +243,8 @@ function EventManager() { // assumed to be a calendar
 	function decrementPendingSourceCnt() {
 		pendingSourceCnt--;
 		if (!pendingSourceCnt) {
-			reportEventChange(cache);
-			t.trigger('eventsReceived', cache);
+			reportEventChange();
+			t.trigger('eventsReceived', eventDefCollection.buildRenderRanges(rangeStart, rangeEnd, t));
 		}
 	}
 

+ 5 - 5
src/common/ChronoComponent.js

@@ -166,17 +166,17 @@ var ChronoComponent = Model.extend({
 
 
 	// Renders the events onto the view.
-	renderEvents: function(events) {
-		this.callChildren('renderEvents', events);
+	renderEventRanges: function(eventRanges) {
+		this.callChildren('renderEventRanges', eventRanges);
 	},
 
 
 	// Removes event elements from the view.
-	unrenderEvents: function() {
-		this.callChildren('unrenderEvents');
+	unrenderEventRanges: function() {
+		this.callChildren('unrenderEventRanges');
 
 		// we DON'T need to call updateHeight() because
-		// a renderEvents() call always happens after this, which will eventually call updateHeight()
+		// a renderEventRanges() call always happens after this, which will eventually call updateHeight()
 	},
 
 

+ 16 - 15
src/common/View.js

@@ -263,7 +263,7 @@ var View = FC.View = ChronoComponent.extend({
 
 
 	bindEventChanges: function() {
-		this.listenTo(this.calendar, 'eventsReset', this.resetEvents);
+		this.listenTo(this.calendar, 'eventsReset', this.resetEventRanges);
 	},
 
 
@@ -272,22 +272,22 @@ var View = FC.View = ChronoComponent.extend({
 	},
 
 
-	setEvents: function(events) {
-		this.set('currentEvents', events);
+	setEventRanges: function(eventRanges) {
+		this.set('currentEventRanges', eventRanges);
 		this.set('hasEvents', true);
 	},
 
 
 	unsetEvents: function() {
-		this.unset('currentEvents');
+		this.unset('currentEventRanges');
 		this.unset('hasEvents');
 	},
 
 
-	resetEvents: function(events) {
+	resetEventRanges: function(eventRanges) {
 		this.startBatchRender();
 		this.unsetEvents();
-		this.setEvents(events);
+		this.setEventRanges(eventRanges);
 		this.stopBatchRender();
 	},
 
@@ -296,11 +296,11 @@ var View = FC.View = ChronoComponent.extend({
 	// -----------------------------------------------------------------------------------------------------------------
 
 
-	requestEventsRender: function(events) {
+	requestEventsRender: function(eventRanges) {
 		var _this = this;
 
 		this.renderQueue.queue(function() {
-			_this.executeEventsRender(events);
+			_this.executeEventsRender(eventRanges);
 		}, 'event', 'init');
 	},
 
@@ -614,8 +614,9 @@ var View = FC.View = ChronoComponent.extend({
 	// -----------------------------------------------------------------------------------------------------------------
 
 
-	executeEventsRender: function(events) {
-		this.renderEvents(events);
+	executeEventsRender: function(eventRanges) {
+
+		this.renderEventRanges(eventRanges);
 		this.isEventsRendered = true;
 
 		this.onEventsRender();
@@ -629,7 +630,7 @@ var View = FC.View = ChronoComponent.extend({
 			this.destroyEvents(); // TODO: deprecate
 		}
 
-		this.unrenderEvents();
+		this.unrenderEventRanges();
 		this.isEventsRendered = false;
 	},
 
@@ -932,13 +933,13 @@ View.watch('displayingDates', [ 'dateProfile' ], function(deps) {
 });
 
 
-View.watch('initialEvents', [ 'dateProfile' ], function(deps) {
+View.watch('initialEventRanges', [ 'dateProfile' ], function(deps) {
 	return this.fetchInitialEvents(deps.dateProfile);
 });
 
 
-View.watch('bindingEvents', [ 'initialEvents' ], function(deps) {
-	this.setEvents(deps.initialEvents);
+View.watch('bindingEvents', [ 'initialEventRanges' ], function(deps) {
+	this.setEventRanges(deps.initialEventRanges);
 	this.bindEventChanges();
 }, function() {
 	this.unbindEventChanges();
@@ -947,7 +948,7 @@ View.watch('bindingEvents', [ 'initialEvents' ], function(deps) {
 
 
 View.watch('displayingEvents', [ 'displayingDates', 'hasEvents' ], function() {
-	this.requestEventsRender(this.get('currentEvents')); // if there were event mutations after initialEvents
+	this.requestEventsRender(this.get('currentEventRanges')); // if there were event mutations after initialEventRanges
 }, function() {
 	this.requestEventsUnrender();
 });