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

@rwwagner90
Copy link
Collaborator

rwwagner90 commented Aug 18, 2017

No description provided.

Copy link
Owner

kybishop left a comment

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))

This comment has been minimized.

Copy link
@kybishop

kybishop Aug 18, 2017

Owner

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?

This comment has been minimized.

Copy link
@rwwagner90

rwwagner90 Aug 19, 2017

Author Collaborator

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)) {

This comment has been minimized.

Copy link
@kybishop

kybishop Aug 18, 2017

Owner

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)) {

This comment has been minimized.

Copy link
@kybishop
&& 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)) {

This comment has been minimized.

Copy link
@kybishop
&& 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)) {

This comment has been minimized.

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

This comment has been minimized.

Copy link
@kybishop
@kybishop kybishop merged commit 8bc50eb into master Aug 20, 2017
@kybishop kybishop deleted the module-syntax branch Aug 26, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.