Explorar el Código

isFinalized -> isPopulated

Adam Shaw hace 8 años
padre
commit
bf931d9aac

+ 1 - 1
src/agenda/AgendaView.js

@@ -296,7 +296,7 @@ var AgendaView = FC.AgendaView = View.extend({
 		}
 
 		// initial event instances. simulate a changeset
-		if (eventDataSource.isFinalized()) {
+		if (eventDataSource.isPopulated) {
 			processChangeset(
 				new EventInstanceChangeset(false, null, eventDataSource.instanceRepo),
 				true // isInitial=true

+ 1 - 1
src/component/DateComponent.js

@@ -282,7 +282,7 @@ var DateComponent = FC.DateComponent = Component.extend({
 			this.eventRenderer.rangeUpdated();
 		}
 
-		if (eventDataSource.isFinalized()) {
+		if (eventDataSource.isPopulated) {
 			this.requestEventRender(eventDataSource.instanceRepo);
 		}
 

+ 0 - 5
src/models/EventManager.js

@@ -38,11 +38,6 @@ var EventManager = Class.extend(EmitterMixin, ListenerMixin, {
 	},
 
 
-	isFinalized: function() {
-		return this.currentPeriod && this.currentPeriod.isFinalized();
-	},
-
-
 	// Source Adding/Removing
 	// -----------------------------------------------------------------------------------------------------------------
 

+ 11 - 7
src/models/EventPeriod.js

@@ -4,6 +4,7 @@ var EventInstanceDataSource = Class.extend(EmitterMixin, {
 	instanceRepo: null,
 	freezeDepth: 0,
 	outboundChangeset: null,
+	isPopulated: false,
 
 
 	constructor: function() {
@@ -12,7 +13,7 @@ var EventInstanceDataSource = Class.extend(EmitterMixin, {
 
 
 	tryReset: function() {
-		if (this.isFinalized()) {
+		if (this.canTrigger()) {
 			this.triggerChangeset(new EventInstanceChangeset(
 				true, // isClear
 				null, // removals
@@ -31,7 +32,6 @@ var EventInstanceDataSource = Class.extend(EmitterMixin, {
 			this.outboundChangeset = new EventInstanceChangeset();
 		}
 
-		changeset.applyToRepo(this.instanceRepo); // internally record immediately
 		changeset.applyToChangeset(this.outboundChangeset);
 
 		this.trySendOutbound();
@@ -49,11 +49,15 @@ var EventInstanceDataSource = Class.extend(EmitterMixin, {
 	},
 
 
-	trySendOutbound: function() {
+	trySendOutbound: function() { // also might apply outbound changes to INTERNAL data
 		var outboundChangeset = this.outboundChangeset;
 
-		if (this.isFinalized()) {
+		if (this.canTrigger()) {
+			this.isPopulated = true; // event if empty result, consider populated
+
 			if (outboundChangeset) {
+				outboundChangeset.applyToRepo(this.instanceRepo); // finally internally record
+
 				this.outboundChangeset = null;
 				this.triggerChangeset(outboundChangeset);
 			}
@@ -66,7 +70,7 @@ var EventInstanceDataSource = Class.extend(EmitterMixin, {
 	},
 
 
-	isFinalized: function() {
+	canTrigger: function() {
 		return !this.freezeDepth;
 	},
 
@@ -344,8 +348,8 @@ var EventPeriod = EventInstanceDataSource.extend({
 	},
 
 
-	isFinalized: function() {
-		return EventInstanceDataSource.prototype.isFinalized.apply(this, arguments) &&
+	canTrigger: function() {
+		return EventInstanceDataSource.prototype.canTrigger.apply(this, arguments) &&
 			!this.pendingSourceCnt;
 	}