This repository has been archived by the owner on Sep 5, 2024. It is now read-only.
feat(interaction): added service to detect last interaction #5589
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I added a few more tests, more test will come as soon as possible |
| @@ -227,7 +227,7 @@ function SidenavDirective($mdMedia, $mdUtil, $mdConstant, $mdTheming, $animate, | |||
| */ | |||
| function postLink(scope, element, attr, sidenavCtrl) { | |||
| var lastParentOverFlow; | |||
| var triggeringElement = null; | |||
| var triggeringElement = null, triggeringInteractionType; | |||
There was a problem hiding this comment.
Please separate to another declaration
There was a problem hiding this comment.
Agreed...the trickiness here hinders code readability.
There was a problem hiding this comment.
Won't happen again, didn't know about this style policy ;)
|
Please fix and squash your commits to 1 commit |
This was referenced Nov 9, 2015
devversion
force-pushed
the
fix/sidenav-focus-restore-service
branch
from
642bd11
to
7f45663
Compare
|
Commits successfully squashed, thanks for reviewing @EladBezalel @marcysutton |
devversion
force-pushed
the
fix/sidenav-focus-restore-service
branch
from
7f45663
to
5dd246d
Compare
devversion
added a commit
to devversion/material
that referenced
this pull request
Nov 9, 2015
Sidenav want's to restore focus after the pane gets closed, this should only happen for keyboard interactions. The service got created to use that feature for other components too Fixes angular#5563 Fixes angular#5434 Closes angular#5583 Closes angular#5589 feat(interaction): add test for interaction which fakes a keyboard input and validates it test(interaction): add interaction spec for mousedown event + formats 4 spaces to 2 style(interaction): fix styling of the previous commits
| @@ -0,0 +1,26 @@ | |||
| describe("$mdInteraction", function() { | |||
There was a problem hiding this comment.
I'd love to see some additional tests here. Since the focus style hinges off of .md-focused being added, we could test that it gets added on keyboard interaction and not mouse.
devversion
force-pushed
the
fix/sidenav-focus-restore-service
branch
3 times, most recently
from
febc90e
to
29d4146
Compare
devversion
added a commit
to devversion/material
that referenced
this pull request
Nov 11, 2015
Sidenav want's to restore focus after the pane gets closed, this should only happen for keyboard interactions. The service got created to use that feature for other components too Fixes angular#5563 Fixes angular#5434 Closes angular#5583 Closes angular#5589 feat(interaction): add test for interaction which fakes a keyboard input and validates it test(interaction): add interaction spec for mousedown event + formats 4 spaces to 2 style(interaction): fix styling of the previous commits test(sidenav): add sidenav focus restore test triggered by keyboard test(sidenav): add focus restore test for mouse and patch other one fix(sidenav): test
|
Added two tests into the |
| var el; | ||
| inject(function($compile, $rootScope) { | ||
| var parent = angular.element(document.body); | ||
| el = angular.element('<button aria-label="Toggle Menu">Toggle</button>'); |
There was a problem hiding this comment.
So that the tests show correct requirements, you don't need aria-label here since the button has text in it.
devversion
force-pushed
the
fix/sidenav-focus-restore-service
branch
from
63e270c
to
0cf58e4
Compare
devversion
added a commit
to devversion/material
that referenced
this pull request
Nov 12, 2015
Sidenav want's to restore focus after the pane gets closed, this should only happen for keyboard interactions. The service got created to use that feature for other components too Fixes angular#5563 Fixes angular#5434 Closes angular#5583 Closes angular#5589 feat(interaction): add test for interaction which fakes a keyboard input and validates it test(interaction): add interaction spec for mousedown event + formats 4 spaces to 2 style(interaction): fix styling of the previous commits test(sidenav): add sidenav focus restore test triggered by keyboard test(sidenav): add focus restore test for mouse and patch other one fix(sidenav): test fix(sidenav): replace deprecated methods, and remove aria label test(sidenav): revert deprecated methods.
ThomasBurleson
added
needs: review
| @@ -344,9 +346,9 @@ function SidenavDirective($mdMedia, $mdUtil, $mdConstant, $mdTheming, $animate, | |||
| // When the current `updateIsOpen()` animation finishes | |||
| promise.then(function(result) { | |||
|
|
|||
| if ( !scope.isOpen ) { | |||
| if ( !scope.isOpen && triggeringElement && triggeringInteractionType && triggeringInteractionType === 'keyboard') { | |||
There was a problem hiding this comment.
triggeringInteractionType && triggeringInteractionType === 'keyboard'can be simplified to
triggeringInteractionType === 'keyboard'
devversion
force-pushed
the
fix/sidenav-focus-restore-service
branch
from
d741eab
to
620fa6f
Compare
devversion
added
the
in progress
devversion
force-pushed
the
fix/sidenav-focus-restore-service
branch
from
620fa6f
to
28aa59a
Compare
devversion
removed
the
in progress
devversion
force-pushed
the
fix/sidenav-focus-restore-service
branch
from
28aa59a
to
e9faf66
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sidenav want's to restore focus after the pane gets closed, this should only happen for keyboard interactions.
The service got created to use that feature for other components too
Fixes #5563 Fixes #5434 Closes #5583