Просмотр исходного кода

relocate/rename/expose eventContainsRange

Adam Shaw 9 лет назад
Родитель
Сommit
fbb8a042a2
1 измененных файлов с 11 добавлено и 11 удалено
  1. 11 11
      src/EventManager.js

+ 11 - 11
src/EventManager.js

@@ -1106,7 +1106,7 @@ function EventManager() { // assumed to be a calendar
 
 			anyContainment = false;
 			for (i = 0; i < constraintEvents.length; i++) {
-				if (eventContainsRange(constraintEvents[i], span)) {
+				if (t.spanContainsSpan(constraintEvents[i], span)) {
 					anyContainment = true;
 					break;
 				}
@@ -1175,16 +1175,6 @@ function EventManager() { // assumed to be a calendar
 	}
 
 
-	// Does the event's date range fully contain the given range?
-	// start/end already assumed to have stripped zones :(
-	function eventContainsRange(event, range) {
-		var eventStart = event.start.clone().stripZone();
-		var eventEnd = t.getEventEnd(event).stripZone();
-
-		return range.start >= eventStart && range.end <= eventEnd;
-	}
-
-
 	// Does the event's date range intersect with the given range?
 	// start/end already assumed to have stripped zones :(
 	function eventIntersectsRange(event, range) {
@@ -1208,6 +1198,16 @@ Calendar.prototype.normalizeEvent = function(event) {
 };
 
 
+// Does the given span (start, end, and other location information)
+// fully contain the other?
+Calendar.prototype.spanContainsSpan = function(outerSpan, innerSpan) {
+	var eventStart = outerSpan.start.clone().stripZone();
+	var eventEnd = this.getEventEnd(outerSpan).stripZone();
+
+	return innerSpan.start >= eventStart && innerSpan.end <= eventEnd;
+};
+
+
 // Returns a list of events that the given event should be compared against when being considered for a move to
 // the specified span. Attached to the Calendar's prototype because EventManager is a mixin for a Calendar.
 Calendar.prototype.getPeerEvents = function(span, event) {