Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Module syntax #26

Merged
merged 4 commits into from
Aug 20, 2017
Merged

Module syntax #26

merged 4 commits into from
Aug 20, 2017

Conversation

RobbieTheWagner
Copy link
Collaborator

No description provided.

Copy link
Collaborator

@kybishop kybishop left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a few nitpicks on conditional indentation, otherwise looks good! Huge thanks for this PR!

// The ember-attacher-inner element is wrapped in the ember-attacher element
&& !this.element.parentNode.contains(event.target)) {
if (!target.contains(event.target)
&& !(this.get('isOffset') && this._isCursorBetweenTargetAndAttachment(event))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like to keep multi-line conditionals double-indented to show a clear distinction between the conditionals and inner block. Were you seeing eslint complain because of these?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was just autoformat. I do 2 spaces for all the things. I can fix.

&& clientY < Math.max(attachmentPosition.bottom, targetPosition.bottom)) {
&& clientX >= attachmentPosition.right && clientX <= targetPosition.left
&& clientY > Math.min(attachmentPosition.top, targetPosition.top)
&& clientY < Math.max(attachmentPosition.bottom, targetPosition.bottom)) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

&& clientY < Math.max(attachmentPosition.bottom, targetPosition.bottom)) {
&& clientX <= attachmentPosition.left && clientX >= targetPosition.right
&& clientY > Math.min(attachmentPosition.top, targetPosition.top)
&& clientY < Math.max(attachmentPosition.bottom, targetPosition.bottom)) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

etc.

&& clientX < Math.max(attachmentPosition.right, targetPosition.right)) {
&& clientY <= attachmentPosition.top && clientY >= targetPosition.bottom
&& clientX > Math.min(attachmentPosition.left, targetPosition.left)
&& clientX < Math.max(attachmentPosition.right, targetPosition.right)) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

etc.

&& clientX < Math.max(attachmentPosition.right, targetPosition.right)) {
&& clientY >= attachmentPosition.bottom && clientY <= targetPosition.top
&& clientX > Math.min(attachmentPosition.left, targetPosition.left)
&& clientX < Math.max(attachmentPosition.right, targetPosition.right)) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

etc.

|| (!this.get('_target').contains(event.relatedTarget)
&& !this.element.contains(event.relatedTarget))) {
|| (!this.get('_target').contains(event.relatedTarget)
&& !this.element.contains(event.relatedTarget))) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

etc.

@kybishop kybishop merged commit 8bc50eb into master Aug 20, 2017
@kybishop kybishop deleted the module-syntax branch August 26, 2017 04:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants