diff options
| author | mrmr1993 | 2017-07-04 12:46:42 +0100 |
|---|---|---|
| committer | mrmr1993 | 2017-11-01 07:46:22 +0000 |
| commit | e424bb942b58e5cee3506e42b6f3aa9008eb7b17 (patch) | |
| tree | 6e39bb954d67bf486db385562f5a3307916fa243 | |
| parent | 8cd39d357b129e40b1e3a8fc99910bf4c76747c0 (diff) | |
| download | vimium-e424bb942b58e5cee3506e42b6f3aa9008eb7b17.tar.bz2 | |
Rename Rect.contains to Rect.intersects, add an explanitory comment
| -rw-r--r-- | lib/rect.coffee | 3 | ||||
| -rw-r--r-- | tests/unit_tests/rect_test.coffee | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/rect.coffee b/lib/rect.coffee index fdeace25..703c640c 100644 --- a/lib/rect.coffee +++ b/lib/rect.coffee @@ -67,7 +67,8 @@ Rect = rects.filter (rect) -> rect.height > 0 and rect.width > 0 - contains: (rect1, rect2) -> + # Determine whether two rects overlap. + intersects: (rect1, rect2) -> rect1.right > rect2.left and rect1.left < rect2.right and rect1.bottom > rect2.top and diff --git a/tests/unit_tests/rect_test.coffee b/tests/unit_tests/rect_test.coffee index 0773dbcf..78985bf8 100644 --- a/tests/unit_tests/rect_test.coffee +++ b/tests/unit_tests/rect_test.coffee @@ -201,7 +201,7 @@ context "Rect subtraction", subtractRect = Rect.create x, y, (x + width), (y + height) resultRects = Rect.subtract rect, subtractRect for resultRect in resultRects - assert.isFalse Rect.contains subtractRect, resultRect + assert.isFalse Rect.intersects subtractRect, resultRect should "be contained in original rect", -> rect = Rect.create 0, 0, 3, 3 @@ -212,7 +212,7 @@ context "Rect subtraction", subtractRect = Rect.create x, y, (x + width), (y + height) resultRects = Rect.subtract rect, subtractRect for resultRect in resultRects - assert.isTrue Rect.contains rect, resultRect + assert.isTrue Rect.intersects rect, resultRect should "contain the subtracted rect in the original minus the results", -> rect = Rect.create 0, 0, 3, 3 @@ -229,7 +229,7 @@ context "Rect subtraction", assert.isTrue (resultComplement.length == 0 or resultComplement.length == 1) if resultComplement.length == 1 complementRect = resultComplement[0] - assert.isTrue Rect.contains subtractRect, complementRect + assert.isTrue Rect.intersects subtractRect, complementRect context "Rect overlaps", should "detect that a rect overlaps itself", -> |