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

fix(drag-drop): enable drag interactions when there is a drag handle #13780

Merged
merged 1 commit into from
Nov 7, 2018

Conversation

atscott
Copy link
Contributor

@atscott atscott commented Oct 24, 2018

If there is a drag handle, do not disable native drag events on the cdkDrag
element.

@atscott atscott requested a review from crisbeto as a code owner October 24, 2018 00:57
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Oct 24, 2018
@crisbeto
Copy link
Member

Also the commit message should be change to something like this:

fix(drag-drop): enable drag interactions when there is a drag handle

If there is a drag handle, do not disable native drag events on the cdkDrag
element.

Fixes #13779.

@atscott atscott changed the title fix(13779): enable drag interactions when there is a drag handle fix(drag-drop): enable drag interactions when there is a drag handle Oct 24, 2018
@atscott atscott force-pushed the draginteractions branch 2 times, most recently from 4487ba1 to b0dbb3a Compare October 24, 2018 16:21
Copy link
Member

@crisbeto crisbeto left a comment

Choose a reason for hiding this comment

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

LGTM

@crisbeto crisbeto added pr: lgtm action: merge The PR is ready for merge by the caretaker target: patch This PR is targeted for the next patch release labels Oct 24, 2018
@jelbourn
Copy link
Member

jelbourn commented Nov 3, 2018

@crisbeto passes presubmit, just needs rebase

@ngbot
Copy link

ngbot bot commented Nov 3, 2018

Hi @atscott! This PR has merge conflicts due to recent upstream merges.
Please help to unblock it by resolving these conflicts. Thanks!

@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla label to yes (if enabled on your project), and then merge this pull request when appropriate.

@googlebot googlebot added cla: no PR author must sign Google's Contributor License Agreement: https://opensource.google.com/docs/cla and removed cla: yes PR author has agreed to Google's Contributor License Agreement labels Nov 5, 2018
@googlebot
Copy link

CLAs look good, thanks!

@googlebot googlebot added cla: yes PR author has agreed to Google's Contributor License Agreement and removed cla: no PR author must sign Google's Contributor License Agreement: https://opensource.google.com/docs/cla labels Nov 5, 2018
@atscott atscott force-pushed the draginteractions branch 3 times, most recently from 34c63ba to b0dbb3a Compare November 5, 2018 20:16
@atscott
Copy link
Contributor Author

atscott commented Nov 5, 2018

Is there anything I need to do to resolve these or will that be done by whoever merges?

@crisbeto
Copy link
Member

crisbeto commented Nov 5, 2018

@atscott you have to rebase the latest master into your branch.

@atscott
Copy link
Contributor Author

atscott commented Nov 5, 2018

@crisbeto Done.

@vivian-hu-zz
Copy link
Contributor

@atscott looks like you need to rebase and resolve conflict again.

If there is a drag handle, do not disable native drag events on the cdkDrag
element.

Fixes angular#13779.
@atscott
Copy link
Contributor Author

atscott commented Nov 7, 2018

@vivian-hu Done

@vivian-hu-zz vivian-hu-zz merged commit 4ee6636 into angular:master Nov 7, 2018
vivian-hu-zz pushed a commit that referenced this pull request Nov 12, 2018
…13780)

If there is a drag handle, do not disable native drag events on the cdkDrag
element.

Fixes #13779.
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 10, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement target: patch This PR is targeted for the next patch release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants