Commit 980af739 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch...

Merge branch '249778-replace-bstooltip-with-gltooltip-in-app-assets-javascripts-labels_select-js' into 'master'

Resolve "Replace BSTooltip with GlTooltip in app/assets/javascripts/labels_select.js"

See merge request gitlab-org/gitlab!44220
parents 75ef6742 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',
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment