Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
@yoychen
yoychen committed Apr 1, 2020
1 parent 91527ba commit 082395b
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
12 changes: 6 additions & 6 deletions src/core/services/NodeService.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class NodeService {
return this.vm.node;
}

onLeftHelf({ clientX }) {
onLeftHalf({ clientX }) {
const { left, width } = this.getElementBoundingClientRect();

if (clientX < (left + (width / 2))) {
Expand All @@ -29,7 +29,7 @@ class NodeService {
return false;
}

onTopHelf({ clientY }) {
onTopHalf({ clientY }) {
const { top, height } = this.getElementBoundingClientRect();

if (clientY < (top + (height / 2))) {
Expand Down Expand Up @@ -64,7 +64,7 @@ class NodeService {

editor.indicator.setIsForbidden(!editor.draggedNode.canBeSibling(this.getCurrentNode()));

if (this.onLeftHelf(cursor)) {
if (this.onLeftHalf(cursor)) {
editor.indicator.pointBefore(this.getElement());
} else {
editor.indicator.pointAfter(this.getElement());
Expand All @@ -81,7 +81,7 @@ class NodeService {
}

editor.indicator.setIsForbidden(!this.getCurrentNode().isDroppable(editor.draggedNode));
if (this.onTopHelf(cursor)) {
if (this.onTopHalf(cursor)) {
editor.indicator.pointInsideTop(this.getElement());
} else {
editor.indicator.pointInside(this.getElement());
Expand All @@ -104,7 +104,7 @@ class NodeService {
return;
}

if (this.onLeftHelf(cursor)) {
if (this.onLeftHalf(cursor)) {
draggedNode.insertBefore(currentNode);
} else {
draggedNode.insertAfter(currentNode);
Expand All @@ -124,7 +124,7 @@ class NodeService {
return;
}

if (this.onTopHelf(cursor)) {
if (this.onTopHalf(cursor)) {
currentNode.prepend(draggedNode);
} else {
currentNode.append(draggedNode);
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/core/services/NodeService.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,43 +32,43 @@ function createCursor(x, y) {
};
}

describe('onLeftHelf', () => {
describe('onLeftHalf', () => {
it('returns true when the cursor is on the left hand of element', () => {
const nodeService = createNodeService();
const cursor = createCursor(250, 300);

const onLeftHelf = nodeService.onLeftHelf(cursor);
const onLeftHalf = nodeService.onLeftHalf(cursor);

expect(onLeftHelf).toBe(true);
expect(onLeftHalf).toBe(true);
});

it('returns false when the cursor is not on the left hand of element', () => {
const nodeService = createNodeService();
const cursor = createCursor(301, 300);

const onLeftHelf = nodeService.onLeftHelf(cursor);
const onLeftHalf = nodeService.onLeftHalf(cursor);

expect(onLeftHelf).toBe(false);
expect(onLeftHalf).toBe(false);
});
});

describe('onTopHelf', () => {
describe('onTopHalf', () => {
it('returns true when the cursor is on the top half of element', () => {
const nodeService = createNodeService();
const cursor = createCursor(300, 250);

const onTopHelf = nodeService.onTopHelf(cursor);
const onTopHalf = nodeService.onTopHalf(cursor);

expect(onTopHelf).toBe(true);
expect(onTopHalf).toBe(true);
});

it('returns false when the cursor is not on the top half of element', () => {
const nodeService = createNodeService();
const cursor = createCursor(300, 301);

const onTopHelf = nodeService.onTopHelf(cursor);
const onTopHalf = nodeService.onTopHalf(cursor);

expect(onTopHelf).toBe(false);
expect(onTopHalf).toBe(false);
});
});

Expand Down Expand Up @@ -107,7 +107,7 @@ describe('handleCanvasDragOver', () => {
it('calls pointInside() when the cursor is not on the edge of element and not on the top half of element', () => {
const nodeService = createNodeService();
nodeService.onEdge = () => false;
nodeService.onTopHelf = () => false;
nodeService.onTopHalf = () => false;
nodeService.getEditor().indicator.pointInside = jest.fn();
const cursor = createCursor(210, 210);

Expand All @@ -119,7 +119,7 @@ describe('handleCanvasDragOver', () => {
it('calls pointInsideTop() when the cursor is not on the edge of element and on the top half of element', () => {
const nodeService = createNodeService();
nodeService.onEdge = () => false;
nodeService.onTopHelf = () => true;
nodeService.onTopHalf = () => true;
nodeService.getEditor().indicator.pointInsideTop = jest.fn();
const cursor = createCursor(210, 210);

Expand All @@ -132,7 +132,7 @@ describe('handleCanvasDragOver', () => {
describe('handleElementDragOver', () => {
it('calls pointBefore() when the cursor is on the left hand of element', () => {
const nodeService = createNodeService();
nodeService.onLeftHelf = () => true;
nodeService.onLeftHalf = () => true;
nodeService.getEditor().indicator.pointBefore = jest.fn();
const cursor = createCursor(210, 210);

Expand All @@ -143,7 +143,7 @@ describe('handleElementDragOver', () => {

it('calls pointAfter() when the cursor is not on the left hand of element', () => {
const nodeService = createNodeService();
nodeService.onLeftHelf = () => false;
nodeService.onLeftHalf = () => false;
nodeService.getEditor().indicator.pointAfter = jest.fn();
const cursor = createCursor(210, 210);

Expand All @@ -156,7 +156,7 @@ describe('handleElementDragOver', () => {
describe('handleElementDrop', () => {
it('calls insertBefore() when the cursor is on the left hand of element and the target node is allow to be inserted', () => {
const nodeService = createNodeService();
nodeService.onLeftHelf = () => true;
nodeService.onLeftHalf = () => true;
nodeService.getEditor().draggedNode.canBeSibling = () => true;
nodeService.getEditor().draggedNode.insertBefore = jest.fn();
const cursor = createCursor(210, 210);
Expand All @@ -168,7 +168,7 @@ describe('handleElementDrop', () => {

it('does not call insertBefore() when the cursor is on the left hand of element and the target node is not allow to be inserted', () => {
const nodeService = createNodeService();
nodeService.onLeftHelf = () => true;
nodeService.onLeftHalf = () => true;
nodeService.getEditor().draggedNode.canBeSibling = () => false;
nodeService.getEditor().draggedNode.insertBefore = jest.fn();
const cursor = createCursor(210, 210);
Expand All @@ -180,7 +180,7 @@ describe('handleElementDrop', () => {

it('calls insertAfter() when the cursor is not on the left hand of element and the target node is allow to be inserted', () => {
const nodeService = createNodeService();
nodeService.onLeftHelf = () => false;
nodeService.onLeftHalf = () => false;
nodeService.getEditor().draggedNode.canBeSibling = () => true;
nodeService.getEditor().draggedNode.insertAfter = jest.fn();
const cursor = createCursor(210, 210);
Expand All @@ -192,7 +192,7 @@ describe('handleElementDrop', () => {

it('does not call insertAfter() when the cursor is not on the left hand of element and the target node is not allow to be inserted', () => {
const nodeService = createNodeService();
nodeService.onLeftHelf = () => false;
nodeService.onLeftHalf = () => false;
nodeService.getEditor().draggedNode.canBeSibling = () => false;
nodeService.getEditor().draggedNode.insertAfter = jest.fn();
const cursor = createCursor(210, 210);
Expand All @@ -207,7 +207,7 @@ describe('handleCanvasDrop', () => {
it('calls append() when the cursor is not on the edge of element and not on the top half of element and the current node is droppable', () => {
const nodeService = createNodeService();
nodeService.onEdge = () => false;
nodeService.onTopHelf = () => false;
nodeService.onTopHalf = () => false;
nodeService.getCurrentNode().isDroppable = () => true;
nodeService.getCurrentNode().append = jest.fn();
const cursor = createCursor(210, 210);
Expand All @@ -220,7 +220,7 @@ describe('handleCanvasDrop', () => {
it('calls prepend() when the cursor is not on the edge of element and on the top half of element and the current node is droppable', () => {
const nodeService = createNodeService();
nodeService.onEdge = () => false;
nodeService.onTopHelf = () => true;
nodeService.onTopHalf = () => true;
nodeService.getCurrentNode().isDroppable = () => true;
nodeService.getCurrentNode().prepend = jest.fn();
const cursor = createCursor(210, 210);
Expand Down

0 comments on commit 082395b

Please sign in to comment.