Adam Shaw 8 лет назад
Родитель
Сommit
b5021e4b96
2 измененных файлов с 26 добавлено и 26 удалено
  1. 25 0
      src/common/Grid.event-rendering.js
  2. 1 26
      src/common/Grid.js

+ 25 - 0
src/common/Grid.event-rendering.js

@@ -29,6 +29,31 @@ Grid.mixin({
 	},
 
 
+	// Updates values that rely on options and also relate to range
+	processEventRenderingOptions: function() {
+		var displayEventTime;
+		var displayEventEnd;
+
+		this.eventTimeFormat = // for Grid.event-rendering.js
+			this.opt('eventTimeFormat') ||
+			this.opt('timeFormat') || // deprecated
+			this.computeEventTimeFormat();
+
+		displayEventTime = this.opt('displayEventTime');
+		if (displayEventTime == null) {
+			displayEventTime = this.computeDisplayEventTime(); // might be based off of range
+		}
+
+		displayEventEnd = this.opt('displayEventEnd');
+		if (displayEventEnd == null) {
+			displayEventEnd = this.computeDisplayEventEnd(); // might be based off of range
+		}
+
+		this.displayEventTime = displayEventTime;
+		this.displayEventEnd = displayEventEnd;
+	},
+
+
 	renderEventsPayload: function(eventsPayload) {
 		var id, eventInstanceGroup;
 		var eventRenderRanges;

+ 1 - 26
src/common/Grid.js

@@ -52,7 +52,7 @@ var Grid = FC.Grid = ChronoComponent.extend({
 	// Any date-related internal data should be generated.
 	setRange: function(unzonedRange) {
 		this.rangeUpdated();
-		this.processRangeOptions();
+		this.processEventRenderingOptions();
 	},
 
 
@@ -61,31 +61,6 @@ var Grid = FC.Grid = ChronoComponent.extend({
 	},
 
 
-	// Updates values that rely on options and also relate to range
-	processRangeOptions: function() {
-		var displayEventTime;
-		var displayEventEnd;
-
-		this.eventTimeFormat = // for Grid.event-rendering.js
-			this.opt('eventTimeFormat') ||
-			this.opt('timeFormat') || // deprecated
-			this.computeEventTimeFormat();
-
-		displayEventTime = this.opt('displayEventTime');
-		if (displayEventTime == null) {
-			displayEventTime = this.computeDisplayEventTime(); // might be based off of range
-		}
-
-		displayEventEnd = this.opt('displayEventEnd');
-		if (displayEventEnd == null) {
-			displayEventEnd = this.computeDisplayEventEnd(); // might be based off of range
-		}
-
-		this.displayEventTime = displayEventTime;
-		this.displayEventEnd = displayEventEnd;
-	},
-
-
 
 	/* Hit Area
 	------------------------------------------------------------------------------------------------------------------*/