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
a739e1a9
Commit
a739e1a9
authored
Nov 16, 2020
by
Jarek Ostrowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update todo vue tooltip with gl-tooltip
MR:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47810
parent
13a73325
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
14 deletions
+5
-14
app/assets/javascripts/sidebar/components/todo_toggle/todo.vue
...ssets/javascripts/sidebar/components/todo_toggle/todo.vue
+5
-9
spec/frontend/sidebar/__snapshots__/todo_spec.js.snap
spec/frontend/sidebar/__snapshots__/todo_spec.js.snap
+0
-5
No files found.
app/assets/javascripts/sidebar/components/todo_toggle/todo.vue
View file @
a739e1a9
<
script
>
<
script
>
import
{
GlLoadingIcon
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
GlLoadingIcon
,
GlIcon
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
__
}
from
'
~/locale
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
const
MARK_TEXT
=
__
(
'
Mark as done
'
);
const
MARK_TEXT
=
__
(
'
Mark as done
'
);
const
TODO_TEXT
=
__
(
'
Add a To-Do
'
);
const
TODO_TEXT
=
__
(
'
Add a To-Do
'
);
export
default
{
export
default
{
directives
:
{
tooltip
,
},
components
:
{
components
:
{
GlIcon
,
GlIcon
,
GlLoadingIcon
,
GlLoadingIcon
,
},
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
},
props
:
{
props
:
{
issuableId
:
{
issuableId
:
{
type
:
Number
,
type
:
Number
,
...
@@ -71,16 +70,13 @@ export default {
...
@@ -71,16 +70,13 @@ export default {
<
template
>
<
template
>
<button
<button
v-
tooltip
v-
gl-tooltip
.
left
.
viewport
:class=
"buttonClasses"
:class=
"buttonClasses"
:title=
"buttonTooltip"
:title=
"buttonTooltip"
:aria-label=
"buttonLabel"
:aria-label=
"buttonLabel"
:data-issuable-id=
"issuableId"
:data-issuable-id=
"issuableId"
:data-issuable-type=
"issuableType"
:data-issuable-type=
"issuableType"
type=
"button"
type=
"button"
data-container=
"body"
data-placement=
"left"
data-boundary=
"viewport"
@
click=
"handleButtonClick"
@
click=
"handleButtonClick"
>
>
<gl-icon
<gl-icon
...
...
spec/frontend/sidebar/__snapshots__/todo_spec.js.snap
View file @
a739e1a9
...
@@ -4,13 +4,8 @@ exports[`SidebarTodo template renders component container element with proper da
...
@@ -4,13 +4,8 @@ exports[`SidebarTodo template renders component container element with proper da
<button
<button
aria-label="Mark as done"
aria-label="Mark as done"
class="btn btn-default btn-todo issuable-header-btn float-right"
class="btn btn-default btn-todo issuable-header-btn float-right"
data-boundary="viewport"
data-container="body"
data-issuable-id="1"
data-issuable-id="1"
data-issuable-type="epic"
data-issuable-type="epic"
data-original-title=""
data-placement="left"
title=""
type="button"
type="button"
>
>
<gl-icon-stub
<gl-icon-stub
...
...
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