Adam Shaw 8 лет назад
Родитель
Сommit
765cc274e1
3 измененных файлов с 40 добавлено и 37 удалено
  1. 25 23
      src/common/EventRenderUtils.js
  2. 14 14
      src/common/FillSystem.js
  3. 1 0
      src/common/SegChronoComponentMixin.js

+ 25 - 23
src/common/EventRenderUtils.js

@@ -1,7 +1,7 @@
 
 var EventRenderUtils = Class.extend({
 
-	component: null,
+	delegate: null,
 
 	// derived from options
 	eventTimeFormat: null,
@@ -10,44 +10,46 @@ var EventRenderUtils = Class.extend({
 
 
 	/*
-	component defines:
+	delegate defines:
+		- opt
+		- _getView
 		- computeEventTimeFormat (optional, defaults to smallTimeFormat)
 		- computeDisplayEventTime (optional, defaults to true)
 		- computeDisplayEventEnd (optional, defaults to false)
 
 	OTHER REQUIREMENTS:
-		- must call rangeUpdated() when component's range is updated
+		- must call rangeUpdated() when delegate's range is updated
 	*/
-	constructor: function(component) {
-		this.component = component;
+	constructor: function(delegate) {
+		this.delegate = delegate;
 	},
 
 
 	// Updates values that rely on options and also relate to range
 	rangeUpdated: function() {
-		var component = this.component;
+		var delegate = this.delegate;
 		var displayEventTime;
 		var displayEventEnd;
 
 		this.eventTimeFormat =
-			component.opt('eventTimeFormat') ||
-			component.opt('timeFormat') || // deprecated
-			(component.computeEventTimeFormat ?
-				component.computeEventTimeFormat() :
+			delegate.opt('eventTimeFormat') ||
+			delegate.opt('timeFormat') || // deprecated
+			(delegate.computeEventTimeFormat ?
+				delegate.computeEventTimeFormat() :
 				'') ||
-			component.opt('smallTimeFormat');
+			delegate.opt('smallTimeFormat');
 
-		displayEventTime = component.opt('displayEventTime');
-		if (displayEventTime == null && component.computeDisplayEventTime) {
-			displayEventTime = component.computeDisplayEventTime(); // might be based off of range
+		displayEventTime = delegate.opt('displayEventTime');
+		if (displayEventTime == null && delegate.computeDisplayEventTime) {
+			displayEventTime = delegate.computeDisplayEventTime(); // might be based off of range
 		}
 		if (displayEventTime == null) {
 			displayEventTime = true;
 		}
 
-		displayEventEnd = component.opt('displayEventEnd');
-		if (displayEventEnd == null && component.computeDisplayEventEnd) {
-			displayEventEnd = component.computeDisplayEventEnd(); // might be based off of range
+		displayEventEnd = delegate.opt('displayEventEnd');
+		if (displayEventEnd == null && delegate.computeDisplayEventEnd) {
+			displayEventEnd = delegate.computeDisplayEventEnd(); // might be based off of range
 		}
 		if (displayEventEnd == null) {
 			displayEventEnd = true;
@@ -75,7 +77,7 @@ var EventRenderUtils = Class.extend({
 
 
 	_getTimeText: function(start, end, isAllDay, formatStr, displayEnd) {
-		var view = this.component._getView();
+		var view = this.delegate._getView();
 
 		if (formatStr == null) {
 			formatStr = this.eventTimeFormat;
@@ -144,8 +146,8 @@ var EventRenderUtils = Class.extend({
 
 		return source.backgroundColor ||
 			source.color ||
-			this.component.opt('eventBackgroundColor') ||
-			this.component.opt('eventColor');
+			this.delegate.opt('eventBackgroundColor') ||
+			this.delegate.opt('eventColor');
 	},
 
 
@@ -162,8 +164,8 @@ var EventRenderUtils = Class.extend({
 
 		return source.borderColor ||
 			source.color ||
-			this.component.opt('eventBorderColor') ||
-			this.component.opt('eventColor');
+			this.delegate.opt('eventBorderColor') ||
+			this.delegate.opt('eventColor');
 	},
 
 
@@ -177,7 +179,7 @@ var EventRenderUtils = Class.extend({
 	getDefaultTextColor: function(eventFootprint) {
 		var source = eventFootprint.eventDef.source;
 
-		return source.textColor || this.component.opt('eventTextColor');
+		return source.textColor || this.delegate.opt('eventTextColor');
 	}
 
 });

+ 14 - 14
src/common/FillSystem.js

@@ -1,19 +1,19 @@
 
 var FillSystem = Class.extend({ // use for highlight, background events, business hours
 
-	component: null,
+	delegate: null,
 	elsByFill: null, // a hash of jQuery element sets used for rendering each fill. Keyed by fill name.
 
 
 	/*
-	component defines:
+	delegate defines:
 		- fillSegTag (optional, defaults to 'div')
 		- *SegEl
 		- *SegClasses
 		- *SegCss
 	*/
-	constructor: function(component) {
-		this.component = component;
+	constructor: function(delegate) {
+		this.delegate = delegate;
 		this.elsByFill = {};
 	},
 
@@ -42,8 +42,8 @@ var FillSystem = Class.extend({ // use for highlight, background events, busines
 	// Renders and assigns an `el` property for each fill segment. Generic enough to work with different types.
 	// Only returns segments that successfully rendered.
 	buildSegEls: function(type, segs) {
-		var component = this.component;
-		var segElMethod = component[type + 'SegEl'];
+		var delegate = this.delegate;
+		var segElMethod = delegate[type + 'SegEl'];
 		var html = '';
 		var renderedSegs = [];
 		var i;
@@ -63,14 +63,14 @@ var FillSystem = Class.extend({ // use for highlight, background events, busines
 
 				// allow custom filter methods per-type
 				if (segElMethod) {
-					el = segElMethod.call(component, seg, el);
+					el = segElMethod.call(delegate, seg, el);
 				}
 
 				if (el) { // custom filters did not cancel the render
 					el = $(el); // allow custom filter to return raw DOM node
 
 					// correct element type? (would be bad if a non-TD were inserted into a table for example)
-					if (el.is(component.fillSegTag || 'div')) {
+					if (el.is(delegate.fillSegTag || 'div')) {
 						seg.el = el;
 						renderedSegs.push(seg);
 					}
@@ -84,16 +84,16 @@ var FillSystem = Class.extend({ // use for highlight, background events, busines
 
 	// Builds the HTML needed for one fill segment. Generic enough to work with different types.
 	buildSegHtml: function(type, seg) {
-		var component = this.component;
+		var delegate = this.delegate;
 
 		// custom hooks per-type
-		var classesMethod = component[type + 'SegClasses'];
-		var cssMethod = component[type + 'SegCss'];
+		var classesMethod = delegate[type + 'SegClasses'];
+		var cssMethod = delegate[type + 'SegCss'];
 
-		var classes = classesMethod ? classesMethod.call(component, seg) : [];
-		var css = cssToStr(cssMethod ? cssMethod.call(component, seg) : {});
+		var classes = classesMethod ? classesMethod.call(delegate, seg) : [];
+		var css = cssToStr(cssMethod ? cssMethod.call(delegate, seg) : {});
 
-		return '<' + (component.fillSegTag || 'div') +
+		return '<' + (delegate.fillSegTag || 'div') +
 			(classes.length ? ' class="' + classes.join(' ') + '"' : '') +
 			(css ? ' style="' + css + '"' : '') +
 			' />';

+ 1 - 0
src/common/SegChronoComponentMixin.js

@@ -80,6 +80,7 @@ var SegChronoComponentMixin = {
 
 
 	renderFill: function() {
+		// must implement
 	},