Просмотр исходного кода

change where render/unrender triggers are called

Adam Shaw 8 лет назад
Родитель
Сommit
9b76a920aa
2 измененных файлов с 44 добавлено и 24 удалено
  1. 20 20
      src/View.js
  2. 24 4
      src/component/DateComponent.js

+ 20 - 20
src/View.js

@@ -217,17 +217,17 @@ var View = FC.View = InteractiveDateComponent.extend({
 	// -----------------------------------------------------------------------------------------------------------------
 
 
-	handleDateProfileSet: function(dateProfile) {
-		InteractiveDateComponent.prototype.handleDateProfileSet.apply(this, arguments);
+	requestDateRender: function(dateProfile) {
+		InteractiveDateComponent.prototype.requestDateRender.apply(this, arguments);
 
 		this.requestRender('date', 'init-trigger', this.onAfterBaseRender);
 	},
 
 
-	handleDateProfileUnset: function() {
+	requestDateUnrender: function() {
 		this.requestRender('date', 'destroy-trigger', this.onBeforeBaseUnrender);
 
-		InteractiveDateComponent.prototype.handleDateProfileUnset.apply(this, arguments);
+		InteractiveDateComponent.prototype.requestDateUnrender.apply(this, arguments);
 	},
 
 
@@ -465,6 +465,20 @@ var View = FC.View = InteractiveDateComponent.extend({
 	// -----------------------------------------------------------------------------------------------------------------
 
 
+	requestEventsRender: function(eventsPayload) {
+		InteractiveDateComponent.prototype.requestEventsRender.apply(this, arguments);
+
+		this.requestRender('event', 'init-trigger', this.onAfterEventsRender);
+	},
+
+
+	requestEventsUnrender: function() {
+		this.requestRender('event', 'destroy-trigger', this.onBeforeEventsUnrender);
+
+		InteractiveDateComponent.prototype.requestEventsUnrender.apply(this, arguments);
+	},
+
+
 	executeEventsRender: function(eventsPayload) {
 		if (this.renderEvents) { // for legacy custom views
 			this.renderEvents(convertEventsPayloadToLegacyArray(eventsPayload));
@@ -496,22 +510,8 @@ var View = FC.View = InteractiveDateComponent.extend({
 	// -----------------------------------------------------------------------------------------------------------------
 
 
-	handleEventsSet: function(eventsPayload) {
-		InteractiveDateComponent.prototype.handleEventsSet.apply(this, arguments);
-
-		this.requestRender('event', 'init-trigger', this.onAllEventsRender);
-	},
-
-
-	handleEventsUnset: function() {
-		this.requestRender('event', 'destroy-trigger', this.onBeforeAllEventsUnrender);
-
-		InteractiveDateComponent.prototype.handleEventsUnset.apply(this, arguments);
-	},
-
-
 	// Signals that all events have been rendered
-	onAllEventsRender: function() {
+	onAfterEventsRender: function() {
 		var _this = this;
 		var hasSingleHandlers = this.hasPublicHandlers('eventAfterRender');
 
@@ -542,7 +542,7 @@ var View = FC.View = InteractiveDateComponent.extend({
 
 
 	// Signals that all event elements are about to be removed
-	onBeforeAllEventsUnrender: function() {
+	onBeforeEventsUnrender: function() {
 		var _this = this;
 
 		if (this.hasPublicHandlers('eventDestroy')) {

+ 24 - 4
src/component/DateComponent.js

@@ -122,6 +122,16 @@ var DateComponent = Component.extend({
 	},
 
 
+	requestDateRender: function(dateProfile) {
+		this.requestRender('date', 'init', this.executeDateRender, [ dateProfile ]);
+	},
+
+
+	requestDateUnrender: function() {
+		this.requestRender('date', 'destroy', this.executeDateUnrender);
+	},
+
+
 	executeDateRender: function(dateProfile, skipScroll) { // wrapper
 		this.renderDates(dateProfile);
 	},
@@ -283,6 +293,16 @@ var DateComponent = Component.extend({
 	// rendering
 
 
+	requestEventsRender: function(eventsPayload) {
+		this.requestRender('event', 'init', this.executeEventsRender, [ eventsPayload ]);
+	},
+
+
+	requestEventsUnrender: function() {
+		this.requestRender('event', 'destroy', this.executeEventsUnrender);
+	},
+
+
 	executeEventsRender: function(eventsPayload) { // wrapper
 		this.renderEventsPayload(eventsPayload);
 	},
@@ -724,9 +744,9 @@ DateComponent.watch('businessHoursInChildren', [ 'businessHours' ], function(dep
 
 
 DateComponent.watch('displayingDates', [ 'dateProfile' ], function(deps) {
-	this.requestRender('date', 'init', this.executeDateRender, [ deps.dateProfile ]);
+	this.requestDateRender(deps.dateProfile);
 }, function() {
-	this.requestRender('date', 'destroy', this.executeDateUnrender);
+	this.requestDateUnrender();
 });
 
 
@@ -739,7 +759,7 @@ DateComponent.watch('displayingBusinessHours', [ 'displayingDates', 'businessHou
 
 DateComponent.watch('displayingEvents', [ 'displayingDates', 'hasEvents' ], function() {
 	// pass currentEvents in case there were event mutations after initialEvents
-	this.requestRender('event', 'init', this.executeEventsRender, [ this.get('currentEvents') ]);
+	this.requestEventsRender(this.get('currentEvents'));
 }, function() {
-	this.requestRender('event', 'destroy', this.executeEventsUnrender);
+	this.requestEventsUnrender();
 });