diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-20 06:09:03 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-20 06:09:03 +0000 |
commit | 99551d44588b9c815df9691c8e619eb8beaa0045 (patch) | |
tree | e1244297818b544c6837b2eefc58f1fe288b8b90 /app/assets/javascripts/labels_select.js | |
parent | fe75b57542f67ae643d42e9ab7f317cedb51df71 (diff) | |
download | gitlab-ce-99551d44588b9c815df9691c8e619eb8beaa0045.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/labels_select.js')
-rw-r--r-- | app/assets/javascripts/labels_select.js | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index 7b8193d5bf3..8bbd4300c96 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -4,7 +4,7 @@ import $ from 'jquery'; import { difference, isEqual, escape, sortBy, template, union } from 'lodash'; -import { sprintf, s__, __ } from './locale'; +import { sprintf, __ } from './locale'; import axios from './lib/utils/axios_utils'; import IssuableBulkUpdateActions from './issuable_bulk_update_actions'; import CreateLabelDropdown from './create_label'; @@ -13,7 +13,6 @@ 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 = {}) { @@ -44,7 +43,6 @@ export default class LabelsSelect { const $block = $selectbox.closest('.block'); const $form = $dropdown.closest('form, .js-issuable-update'); const $sidebarCollapsedValue = $block.find('.sidebar-collapsed-icon span'); - const $sidebarLabelTooltip = $block.find('.js-sidebar-labels-tooltip'); const $value = $block.find('.value'); const $dropdownMenu = $dropdown.parent().find('.dropdown-menu'); // eslint-disable-next-line no-jquery/no-fade @@ -91,7 +89,6 @@ export default class LabelsSelect { axios .put(issueUpdateURL, data) .then(({ data }) => { - let labelTooltipTitle; let template; // eslint-disable-next-line no-jquery/no-fade $loading.fadeOut(); @@ -151,24 +148,6 @@ export default class LabelsSelect { $value.removeAttr('style').html(template); $sidebarCollapsedValue.text(labelCount); - if (data.labels.length) { - let labelTitles = data.labels.map(label => label.title); - - if (labelTitles.length > 5) { - labelTitles = labelTitles.slice(0, 5); - labelTitles.push( - sprintf(s__('Labels|and %{count} more'), { count: data.labels.length - 5 }), - ); - } - - labelTooltipTitle = labelTitles.join(', '); - } else { - labelTooltipTitle = __('Labels'); - } - - $sidebarLabelTooltip.attr('title', labelTooltipTitle); - fixTitle($sidebarLabelTooltip); - $('.has-tooltip', $value).tooltip({ container: 'body', }); |