rename to EventRenderer

src.json

@@ -30,7 +30,7 @@
     "component/interaction/EventResizing.js",
     "component/interaction/ExternalDropping.js",
     "component/interaction/EventPointing.js",
-    "component/EventRenderUtils.js",
+    "component/EventRenderer.js",
     "component/ChronoComponent.js",
     "component/CoordChronoComponentMixin.js",
     "component/SegChronoComponentMixin.js",

src/common/DayGrid.events.js

@@ -2,14 +2,14 @@
 /* Event-rendering methods for the DayGrid class
 ----------------------------------------------------------------------------------------------------------------------*/
 
-var DayGridEventRenderer = EventRenderUtils.extend({
+var DayGridEventRenderer = EventRenderer.extend({
 
 	dayGrid: null,
 	rowStructs: null, // an array of objects, each holding information about a row's foreground event-rendering
 
 
 	constructor: function(dayGrid) {
-		EventRenderUtils.call(this, dayGrid);
+		EventRenderer.call(this, dayGrid);
 
 		this.dayGrid = dayGrid;
 	},

src/common/DayGrid.js

@@ -4,7 +4,7 @@
 
 var DayGrid = FC.DayGrid = ChronoComponent.extend(CoordChronoComponentMixin, SegChronoComponentMixin, DayTableMixin, {
 
-	eventRenderUtilsClass: DayGridEventRenderer,
+	eventRendererClass: DayGridEventRenderer,
 
 	view: null, // TODO: make more general and/or remove
 
@@ -59,7 +59,7 @@ var DayGrid = FC.DayGrid = ChronoComponent.extend(CoordChronoComponentMixin, Seg
 
 		// needs to go after updateDayTable because computeEventTimeFormat/computeDisplayEventEnd depends on colCnt.
 		// TODO: easy to forget. use listener.
-		this.eventRenderUtils.rangeUpdated();
+		this.eventRenderer.rangeUpdated();
 	},
 
 
@@ -403,8 +403,8 @@ var DayGrid = FC.DayGrid = ChronoComponent.extend(CoordChronoComponentMixin, Seg
 		var segs = this.eventFootprintsToSegs(eventFootprints);
 		var rowStructs;
 
-		segs = this.eventRenderUtils.renderFgSegEls(segs); // assigns each seg's el and returns a subset of segs that were rendered
-		rowStructs = this.eventRenderUtils.renderSegRows(segs);
+		segs = this.eventRenderer.renderFgSegEls(segs); // assigns each seg's el and returns a subset of segs that were rendered
+		rowStructs = this.eventRenderer.renderSegRows(segs);
 
 		// inject each new event skeleton into each associated row
 		this.rowEls.each(function(row, rowNode) {

src/common/DayGrid.limit.js

@@ -19,7 +19,7 @@ DayGrid.mixin({
 	// Limits the number of "levels" (vertically stacking layers of events) for each row of the grid.
 	// `levelLimit` can be false (don't limit), a number, or true (should be computed).
 	limitRows: function(levelLimit) {
-		var rowStructs = this.eventRenderUtils.rowStructs || [];
+		var rowStructs = this.eventRenderer.rowStructs || [];
 		var row; // row #
 		var rowLevelLimit;
 
@@ -49,7 +49,7 @@ DayGrid.mixin({
 	computeRowLevelLimit: function(row) {
 		var rowEl = this.rowEls.eq(row); // the containing "fake" row div
 		var rowHeight = rowEl.height(); // TODO: cache somehow?
-		var trEls = this.eventRenderUtils.rowStructs[row].tbodyEl.children();
+		var trEls = this.eventRenderer.rowStructs[row].tbodyEl.children();
 		var i, trEl;
 		var trHeight;
 
@@ -80,7 +80,7 @@ DayGrid.mixin({
 	// `levelLimit` is a number for the maximum (inclusive) number of levels allowed.
 	limitRow: function(row, levelLimit) {
 		var _this = this;
-		var rowStruct = this.eventRenderUtils.rowStructs[row];
+		var rowStruct = this.eventRenderer.rowStructs[row];
 		var moreNodes = []; // array of "more" <a> links and <td> DOM nodes
 		var col = 0; // col #, left-to-right (not chronologically)
 		var levelSegs; // array of segment objects in the last allowable level, ordered left-to-right
@@ -167,7 +167,7 @@ DayGrid.mixin({
 	// Reveals all levels and removes all "more"-related elements for a grid's row.
 	// `row` is a row number.
 	unlimitRow: function(row) {
-		var rowStruct = this.eventRenderUtils.rowStructs[row];
+		var rowStruct = this.eventRenderer.rowStructs[row];
 
 		if (rowStruct.moreEls) {
 			rowStruct.moreEls.remove();
@@ -315,7 +315,7 @@ DayGrid.mixin({
 		var i;
 
 		// render each seg's `el` and only return the visible segs
-		segs = this.eventRenderUtils.renderFgSegEls(segs, true); // disableResizing=true
+		segs = this.eventRenderer.renderFgSegEls(segs, true); // disableResizing=true
 		this.popoverSegs = segs;
 
 		for (i = 0; i < segs.length; i++) {
@@ -349,7 +349,7 @@ DayGrid.mixin({
 
 		// force an order because eventsToSegs doesn't guarantee one
 		// TODO: research if still needed
-		this.eventRenderUtils.sortEventSegs(newSegs);
+		this.eventRenderer.sortEventSegs(newSegs);
 
 		return newSegs;
 	},
@@ -371,7 +371,7 @@ DayGrid.mixin({
 	// Returns segments within a given cell.
 	// If `startLevel` is specified, returns only events including and below that level. Otherwise returns all segs.
 	getCellSegs: function(row, col, startLevel) {
-		var segMatrix = this.eventRenderUtils.rowStructs[row].segMatrix;
+		var segMatrix = this.eventRenderer.rowStructs[row].segMatrix;
 		var level = startLevel || 0;
 		var segs = [];
 		var seg;

src/common/TimeGrid.events.js

@@ -3,13 +3,13 @@
 Only handles foreground segs.
 Does not own rendering. Use for low-level util methods by TimeGrid.
 */
-var TimeGridEventRenderer = EventRenderUtils.extend({
+var TimeGridEventRenderer = EventRenderer.extend({
 
 	timeGrid: null,
 
 
 	constructor: function(timeGrid) {
-		EventRenderUtils.call(this, timeGrid);
+		EventRenderer.call(this, timeGrid);
 
 		this.timeGrid = timeGrid;
 	},

src/common/TimeGrid.js

@@ -5,7 +5,7 @@
 
 var TimeGrid = FC.TimeGrid = ChronoComponent.extend(CoordChronoComponentMixin, SegChronoComponentMixin, DayTableMixin, {
 
-	eventRenderUtilsClass: TimeGridEventRenderer,
+	eventRendererClass: TimeGridEventRenderer,
 
 	view: null, // TODO: make more general and/or remove
 
@@ -85,7 +85,7 @@ var TimeGrid = FC.TimeGrid = ChronoComponent.extend(CoordChronoComponentMixin, S
 
 		// needs to go after updateDayTable because computeEventTimeFormat/computeDisplayEventEnd depends on colCnt.
 		// TODO: easy to forget. use listener.
-		this.eventRenderUtils.rangeUpdated();
+		this.eventRenderer.rangeUpdated();
 
 		this.dayRanges = this.dayDates.map(function(dayDate) {
 			return new UnzonedRange(
@@ -588,7 +588,7 @@ var TimeGrid = FC.TimeGrid = ChronoComponent.extend(CoordChronoComponentMixin, S
 
 
 	renderFgSegs: function(segs) {
-		segs = this.eventRenderUtils.renderFgSegsIntoContainers(segs, this.fgContainerEls);
+		segs = this.eventRenderer.renderFgSegsIntoContainers(segs, this.fgContainerEls);
 
 		this.fgSegs = segs;
 
@@ -685,7 +685,7 @@ var TimeGrid = FC.TimeGrid = ChronoComponent.extend(CoordChronoComponentMixin, S
 		var i, seg;
 		var sourceEl;
 
-		segs = this.eventRenderUtils.renderFgSegsIntoContainers(segs, this.helperContainerEls);
+		segs = this.eventRenderer.renderFgSegsIntoContainers(segs, this.helperContainerEls);
 
 		// Try to make the segment that is in the same row as sourceSeg look the same
 		for (i = 0; i < segs.length; i++) {

src/component/EventRenderUtils.js → src/component/EventRenderer.js

@@ -1,5 +1,5 @@
 
-var EventRenderUtils = Class.extend({
+var EventRenderer = Class.extend({
 
 	view: null,
 
@@ -127,7 +127,7 @@ var EventRenderUtils = Class.extend({
 
 	// Given an event and the default element used for rendering, returns the element that should actually be used.
 	// Basically runs events and elements through the eventRender hook.
-	filterEventRenderEl: function(eventFootprint, el) { // TODO: move this to EventRenderUtils!!!
+	filterEventRenderEl: function(eventFootprint, el) {
 		var legacy = eventFootprint.getEventLegacy();
 
 		var custom = this.view.publiclyTrigger('eventRender', {

src/component/SegChronoComponentMixin.js

@@ -14,15 +14,15 @@ This mixin can depend on ChronoComponent:
 */
 var SegChronoComponentMixin = {
 
-	eventRenderUtilsClass: EventRenderUtils,
+	eventRendererClass: EventRenderer,
 
 	segs: null, // the *event* segments currently rendered in the grid. TODO: rename to `eventSegs`
-	eventRenderUtils: null,
+	eventRenderer: null,
 	fillSystem: null,
 
 
 	initSegChronoComponent: function() {
-		this.eventRenderUtils = new this.eventRenderUtilsClass(this);
+		this.eventRenderer = new this.eventRendererClass(this);
 		this.fillSystem = new this.fillSystemClass(this);
 	},
 
@@ -88,13 +88,13 @@ var SegChronoComponentMixin = {
 
 	// Renders foreground event segments onto the grid. May return a subset of segs that were rendered.
 	renderFgSegs: function(segs) {
-		return this.eventRenderUtils.renderFgSegs(segs);
+		return this.eventRenderer.renderFgSegs(segs);
 	},
 
 
 	// Unrenders all currently rendered foreground segments
 	unrenderFgSegs: function() {
-		this.eventRenderUtils.unrenderFgSegs();
+		this.eventRenderer.unrenderFgSegs();
 	},
 
 
@@ -150,12 +150,12 @@ var SegChronoComponentMixin = {
 
 	fillSystemClass: FillSystem.extend({
 
-		eventRenderUtils: null,
+		eventRenderer: null,
 
 
 		constructor: function(component) {
 			FillSystem.call(this);
-			this.eventRenderUtils = component.eventRenderUtils;
+			this.eventRenderer = component.eventRenderer;
 		},
 
 
@@ -166,20 +166,20 @@ var SegChronoComponentMixin = {
 
 		// Renders a background event element, given the default rendering. Called by the fill system.
 		bgEventSegEl: function(seg, el) {
-			return this.eventRenderUtils.filterEventRenderEl(seg.footprint, el);
+			return this.eventRenderer.filterEventRenderEl(seg.footprint, el);
 		},
 
 
 		// Generates an array of classNames to be used for the default rendering of a background event.
 		bgEventSegClasses: function(seg) {
-			return this.eventRenderUtils.getBgClasses(seg.footprint);
+			return this.eventRenderer.getBgClasses(seg.footprint);
 		},
 
 
 		// Generates a semicolon-separated CSS string to be used for the default rendering of a background event.
 		bgEventSegCss: function(seg) {
 			return {
-				'background-color': this.eventRenderUtils.getSkinCss(seg.footprint)['background-color']
+				'background-color': this.eventRenderer.getSkinCss(seg.footprint)['background-color']
 			};
 		},
 

src/list/ListView.js

@@ -87,7 +87,7 @@ var ListView = View.extend(CoordChronoComponentMixin, SegChronoComponentMixin, {
 
 		// a requirement of SegChronoComponentMixin.
 		// TODO: easy to forget. use listener.
-		this.eventRenderUtils.rangeUpdated();
+		this.eventRenderer.rangeUpdated();
 	},
 
 
@@ -140,7 +140,7 @@ var ListView = View.extend(CoordChronoComponentMixin, SegChronoComponentMixin, {
 	},
 
 
-	eventRenderUtilsClass: SegChronoComponentMixin.eventRenderUtilsClass.extend({
+	eventRendererClass: SegChronoComponentMixin.eventRendererClass.extend({
 
 		// like "4:00am"
 		computeEventTimeFormat: function() {
@@ -234,7 +234,7 @@ var ListView = View.extend(CoordChronoComponentMixin, SegChronoComponentMixin, {
 
 	// returns list of foreground segs that were actually rendered
 	renderFgSegs: function(segs) {
-		segs = this.eventRenderUtils.renderFgSegEls(segs); // might filter away hidden events
+		segs = this.eventRenderer.renderFgSegEls(segs); // might filter away hidden events
 
 		if (!segs.length) {
 			this.renderEmptyMessage();
@@ -277,7 +277,7 @@ var ListView = View.extend(CoordChronoComponentMixin, SegChronoComponentMixin, {
 				// append a day header
 				tbodyEl.append(this.dayHeaderHtml(this.dayDates[dayIndex]));
 
-				this.eventRenderUtils.sortEventSegs(daySegs);
+				this.eventRenderer.sortEventSegs(daySegs);
 
 				for (i = 0; i < daySegs.length; i++) {
 					tbodyEl.append(daySegs[i].el); // append event row