module geom

tests/event-drag/EventDragUtils.js

@@ -1,3 +1,4 @@
+import { getRectCenter, intersectRects } from '../lib/geom';
 
 /*
 TODO: Don't rely on legacy simulateDrag
@@ -11,10 +12,10 @@ var EventDragUtils = {
 	drag: function(rect0, rect1, debug) {
 		var el = EventRenderUtils.getSingleEl();
 		var elRect = el[0].getBoundingClientRect();
-		var point0 = Geom.getRectCenter(
-			Geom.intersectRects(elRect, rect0)
+		var point0 = getRectCenter(
+			intersectRects(elRect, rect0)
 		);
-		var point1 = Geom.getRectCenter(rect1);
+		var point1 = getRectCenter(rect1);
 		var deferred = $.Deferred();
 
 		el.simulate('drag', {

tests/event-resize/EventResizeUtils.js

@@ -1,3 +1,4 @@
+import { getRectCenter, getRectTopLeft, subtractPoints, addPoints } from '../lib/geom';
 
 var EventResizeUtils = {
 
@@ -8,14 +9,14 @@ var EventResizeUtils = {
 
 		var resizerEl = eventEl.find('.fc-resizer');
 		var resizerRect = resizerEl[0].getBoundingClientRect();
-		var resizerCenter = Geom.getRectCenter(resizerRect);
+		var resizerCenter = getRectCenter(resizerRect);
 
-		var vector = Geom.subtractPoints(
+		var vector = subtractPoints(
 			resizerCenter,
-			Geom.getRectTopLeft(rect0)
+			getRectTopLeft(rect0)
 		);
-		var point1 = Geom.addPoints(
-			Geom.getRectTopLeft(rect1),
+		var point1 = addPoints(
+			getRectTopLeft(rect1),
 			vector
 		);
 		var deferred = $.Deferred();

tests/lib/Geom.js

@@ -1,67 +0,0 @@
-
-var Geom = {
-
-	getRectCenter: function(rect) {
-		return this.buildPoint(
-			rect.left + rect.width / 2,
-			rect.top + rect.height / 2
-		);
-	},
-
-	intersectRects: function(rect0, rect1) {
-		return this.buildRectViaEdges(
-			Math.max(rect0.left, rect1.left),
-			Math.max(rect0.top, rect1.top),
-			Math.min(rect0.right, rect1.right),
-			Math.min(rect0.bottom, rect1.bottom)
-		);
-	},
-
-	buildRectViaDims: function(left, top, width, height) {
-		return {
-			left: left,
-			top: top,
-			width: width,
-			height: height,
-			right: x + width,
-			bottom: y + height
-		};
-	},
-
-	buildRectViaEdges: function(left, top, right, bottom) {
-		return {
-			left: left,
-			top: top,
-			width: right - left,
-			height: bottom - top,
-			right: right,
-			bottom: bottom
-		};
-	},
-
-	buildPoint: function(left, top) {
-		return {
-			left: left,
-			top: top
-		};
-	},
-
-	subtractPoints: function(point1, point0) {
-		return this.buildPoint(
-			point1.left - point0.left,
-			point1.top - point0.top
-		);
-	},
-
-	addPoints: function(point0, point1) {
-		return this.buildPoint(
-			point0.left + point1.left,
-			point0.top + point1.top
-		);
-	},
-
-	getRectTopLeft: function(rect) {
-		return this.buildPoint(rect.left, rect.top);
-	}
-
-};

tests/lib/geom.js

@@ -0,0 +1,63 @@
+
+export function getRectCenter(rect) {
+	return buildPoint(
+		rect.left + rect.width / 2,
+		rect.top + rect.height / 2
+	);
+}
+
+export function intersectRects(rect0, rect1) {
+	return buildRectViaEdges(
+		Math.max(rect0.left, rect1.left),
+		Math.max(rect0.top, rect1.top),
+		Math.min(rect0.right, rect1.right),
+		Math.min(rect0.bottom, rect1.bottom)
+	);
+}
+
+export function buildRectViaDims(left, top, width, height) {
+	return {
+		left: left,
+		top: top,
+		width: width,
+		height: height,
+		right: x + width,
+		bottom: y + height
+	};
+}
+
+export function buildRectViaEdges(left, top, right, bottom) {
+	return {
+		left: left,
+		top: top,
+		width: right - left,
+		height: bottom - top,
+		right: right,
+		bottom: bottom
+	};
+}
+
+export function buildPoint(left, top) {
+	return {
+		left: left,
+		top: top
+	};
+}
+
+export function subtractPoints(point1, point0) {
+	return buildPoint(
+		point1.left - point0.left,
+		point1.top - point0.top
+	);
+}
+
+export function addPoints(point0, point1) {
+	return buildPoint(
+		point0.left + point1.left,
+		point0.top + point1.top
+	);
+}
+
+export function getRectTopLeft(rect) {
+	return buildPoint(rect.left, rect.top);
+}