Adam Shaw 8 лет назад
Родитель
Сommit
7dce8de2e3

+ 3 - 2
src/Calendar.constraints.js

@@ -200,6 +200,7 @@ function isOverlapsAllowedByFunc(overlapEventFootprints, overlapFunc, subjectEve
 
 
 function isOverlapEventInstancesAllowed(overlapEventFootprints, subjectEventInstance) {
+	var subjectLegacyInstance = subjectEventInstance.toLegacy();
 	var i;
 	var overlapEventInstance;
 	var overlapEventDef;
@@ -220,7 +221,7 @@ function isOverlapEventInstancesAllowed(overlapEventFootprints, subjectEventInst
 			if (
 				!overlapVal(
 					overlapEventInstance.toLegacy(),
-					subjectEventInstance.toLegacy()
+					subjectLegacyInstance
 				)
 			) {
 				return false;
@@ -277,7 +278,7 @@ Calendar.prototype.eventRangeToEventFootprints = function(eventRange) {
 				eventRange.eventDef.isAllDay()
 			),
 			eventRange.eventDef,
-			eventRange.eventInstance
+			eventRange.eventInstance // might not exist
 		)
 	];
 };

+ 1 - 0
src/Calendar.events-api.js

@@ -123,6 +123,7 @@ Calendar.mixin({
 
 		legacyInstances = filterLegacyEventInstances(legacyInstances, legacyQuery);
 
+		// compute unique IDs
 		for (i = 0; i < legacyInstances.length; i++) {
 			idMap[legacyInstances[i].id] = true; // will implicity normalize id to a string
 		}

+ 2 - 0
src/Calendar.js

@@ -295,6 +295,7 @@ var Calendar = FC.Calendar = Class.extend(EmitterMixin, {
 		});
 
 		eventManager.freeze();
+
 		rawSources.forEach(function(rawSource) {
 			var source = EventSourceParser.parse(rawSource, _this);
 
@@ -302,6 +303,7 @@ var Calendar = FC.Calendar = Class.extend(EmitterMixin, {
 				eventManager.addSource(source);
 			}
 		});
+
 		eventManager.thaw();
 	},
 

+ 4 - 5
src/common/ChronoComponent.js

@@ -5,11 +5,10 @@ var ChronoComponent = Model.extend({
 
 	el: null, // the view's containing element. set by Calendar(?)
 
-	// TODO: move below props to Options object
-	//
-	isRTL: false, // why not use this.opt('isRTL') ?
+	// frequently accessed options
+	isRTL: false,
 	nextDayThreshold: null,
-	//
+
 	// classNames styled by jqui themes
 	widgetHeaderClass: null,
 	widgetContentClass: null,
@@ -487,7 +486,7 @@ var ChronoComponent = Model.extend({
 			end = end.clone().subtract(1); // convert to inclusive. last ms of previous day
 		}
 
-		return formatRange(range.start, end, formatStr, separator, this.opt('isRTL'));
+		return formatRange(range.start, end, formatStr, separator, this.isRTL);
 	},
 
 

+ 1 - 1
src/common/Grid.events.js

@@ -1098,7 +1098,7 @@ Grid.mixin({
 					eventRange.eventDef.isAllDay()
 				),
 				eventRange.eventDef,
-				eventRange.eventInstance
+				eventRange.eventInstance // might not exist
 			)
 		];
 	},