Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
27646fff
Commit
27646fff
authored
Nov 29, 2019
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fixes-35624' into 'master'
Fixes 35624 See merge request gitlab-org/gitlab!20092
parents
aea027f7
04cc8b46
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
0 deletions
+8
-0
app/assets/javascripts/user_popovers.js
app/assets/javascripts/user_popovers.js
+1
-0
changelogs/unreleased/fixes-35624.yml
changelogs/unreleased/fixes-35624.yml
+5
-0
spec/javascripts/user_popovers_spec.js
spec/javascripts/user_popovers_spec.js
+2
-0
No files found.
app/assets/javascripts/user_popovers.js
View file @
27646fff
...
@@ -17,6 +17,7 @@ const handleUserPopoverMouseOut = event => {
...
@@ -17,6 +17,7 @@ const handleUserPopoverMouseOut = event => {
renderedPopover
.
$destroy
();
renderedPopover
.
$destroy
();
renderedPopover
=
null
;
renderedPopover
=
null
;
}
}
target
.
removeAttribute
(
'
aria-describedby
'
);
};
};
/**
/**
...
...
changelogs/unreleased/fixes-35624.yml
0 → 100644
View file @
27646fff
---
title
:
Resets aria-describedby on mouseleave
merge_request
:
20092
author
:
carolcarvalhosa
type
:
fixed
spec/javascripts/user_popovers_spec.js
View file @
27646fff
...
@@ -38,6 +38,7 @@ describe('User Popovers', () => {
...
@@ -38,6 +38,7 @@ describe('User Popovers', () => {
const
shownPopover
=
document
.
querySelector
(
'
.popover
'
);
const
shownPopover
=
document
.
querySelector
(
'
.popover
'
);
expect
(
shownPopover
).
not
.
toBeNull
();
expect
(
shownPopover
).
not
.
toBeNull
();
expect
(
targetLink
.
getAttribute
(
'
aria-describedby
'
)).
not
.
toBeNull
();
expect
(
shownPopover
.
innerHTML
).
toContain
(
dummyUser
.
name
);
expect
(
shownPopover
.
innerHTML
).
toContain
(
dummyUser
.
name
);
expect
(
UsersCache
.
retrieveById
).
toHaveBeenCalledWith
(
userId
.
toString
());
expect
(
UsersCache
.
retrieveById
).
toHaveBeenCalledWith
(
userId
.
toString
());
...
@@ -47,6 +48,7 @@ describe('User Popovers', () => {
...
@@ -47,6 +48,7 @@ describe('User Popovers', () => {
setTimeout
(()
=>
{
setTimeout
(()
=>
{
// After Mouse leave it should be hidden now
// After Mouse leave it should be hidden now
expect
(
document
.
querySelector
(
'
.popover
'
)).
toBeNull
();
expect
(
document
.
querySelector
(
'
.popover
'
)).
toBeNull
();
expect
(
targetLink
.
getAttribute
(
'
aria-describedby
'
)).
toBeNull
();
done
();
done
();
});
});
},
210
);
// We need to wait until the 200ms mouseover delay is over, only then the popover will be visible
},
210
);
// We need to wait until the 200ms mouseover delay is over, only then the popover will be visible
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment