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
e14b834a
Commit
e14b834a
authored
Oct 04, 2020
by
Chad Woolley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert labels_select.js to GlTooltip
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44220
parent
c2957bce
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
app/assets/javascripts/labels_select.js
app/assets/javascripts/labels_select.js
+3
-2
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+1
-1
No files found.
app/assets/javascripts/labels_select.js
View file @
e14b834a
...
...
@@ -13,6 +13,7 @@ import ModalStore from './boards/stores/modal_store';
import
boardsStore
from
'
./boards/stores/boards_store
'
;
import
{
isScopedLabel
}
from
'
~/lib/utils/common_utils
'
;
import
initDeprecatedJQueryDropdown
from
'
~/deprecated_jquery_dropdown
'
;
import
{
fixTitle
}
from
'
~/tooltips
'
;
export
default
class
LabelsSelect
{
constructor
(
els
,
options
=
{})
{
...
...
@@ -57,7 +58,6 @@ export default class LabelsSelect {
.
get
();
const
scopedLabels
=
$dropdown
.
data
(
'
scopedLabels
'
);
const
{
handleClick
}
=
options
;
$sidebarLabelTooltip
.
tooltip
();
if
(
$dropdown
.
closest
(
'
.dropdown
'
).
find
(
'
.dropdown-new-label
'
).
length
)
{
new
CreateLabelDropdown
(
...
...
@@ -166,7 +166,8 @@ export default class LabelsSelect {
labelTooltipTitle
=
__
(
'
Labels
'
);
}
$sidebarLabelTooltip
.
attr
(
'
title
'
,
labelTooltipTitle
).
tooltip
(
'
_fixTitle
'
);
$sidebarLabelTooltip
.
attr
(
'
title
'
,
labelTooltipTitle
);
fixTitle
(
$sidebarLabelTooltip
);
$
(
'
.has-tooltip
'
,
$value
).
tooltip
({
container
:
'
body
'
,
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
e14b834a
...
...
@@ -118,7 +118,7 @@
-
else
-
selected_labels
=
issuable_sidebar
[
:labels
]
.block.labels
{
data:
{
qa_selector:
'labels_block'
}
}
.sidebar-collapsed-icon.js-sidebar-labels-tooltip
{
title:
issuable_labels_tooltip
(
selected_labels
),
data:
{
placement:
"left"
,
container:
"body"
,
boundary:
'viewport'
}
}
.sidebar-collapsed-icon.
has-tooltip.
js-sidebar-labels-tooltip
{
title:
issuable_labels_tooltip
(
selected_labels
),
data:
{
placement:
"left"
,
container:
"body"
,
boundary:
'viewport'
}
}
=
sprite_icon
(
'labels'
)
%span
=
selected_labels
.
size
...
...
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