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
a2686ff3
Commit
a2686ff3
authored
Oct 21, 2020
by
Cynthia Ng
Committed by
Kushal Pandya
Oct 21, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate collapsed notification tooltip
parent
e44ad964
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
9 deletions
+10
-9
app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
...cripts/sidebar/components/subscriptions/subscriptions.vue
+4
-8
changelogs/unreleased/229003-migrate-notifications-tooltip.yml
...elogs/unreleased/229003-migrate-notifications-tooltip.yml
+5
-0
spec/frontend/sidebar/subscriptions_spec.js
spec/frontend/sidebar/subscriptions_spec.js
+1
-1
No files found.
app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
View file @
a2686ff3
<
script
>
import
{
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
GlIcon
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
__
}
from
'
~/locale
'
;
import
Tracking
from
'
~/tracking
'
;
import
toggleButton
from
'
~/vue_shared/components/toggle_button.vue
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
eventHub
from
'
../../event_hub
'
;
const
ICON_ON
=
'
notifications
'
;
...
...
@@ -13,7 +12,7 @@ const LABEL_OFF = __('Notifications off');
export
default
{
directives
:
{
tooltip
,
GlTooltip
:
GlTooltipDirective
,
},
components
:
{
GlIcon
,
...
...
@@ -110,12 +109,9 @@ export default {
<div>
<span
ref=
"tooltip"
v-tooltip
class=
"sidebar-collapsed-icon"
v-gl-tooltip
.
viewport
.
left
:title=
"notificationTooltip"
data-container=
"body"
data-placement=
"left"
data-boundary=
"viewport"
class=
"sidebar-collapsed-icon"
@
click=
"onClickCollapsedIcon"
>
<gl-icon
...
...
changelogs/unreleased/229003-migrate-notifications-tooltip.yml
0 → 100644
View file @
a2686ff3
---
title
:
Migrate collapsed notification tooltip
merge_request
:
45453
author
:
artychan
type
:
other
spec/frontend/sidebar/subscriptions_spec.js
View file @
a2686ff3
...
...
@@ -94,7 +94,7 @@ describe('Subscriptions', () => {
it
(
'
sets the correct display text
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
.issuable-header-text
'
).
text
()).
toContain
(
subscribeDisabledDescription
);
expect
(
wrapper
.
find
({
ref
:
'
tooltip
'
}).
attributes
(
'
data-original-
title
'
)).
toBe
(
expect
(
wrapper
.
find
({
ref
:
'
tooltip
'
}).
attributes
(
'
title
'
)).
toBe
(
subscribeDisabledDescription
,
);
});
...
...
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