diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 12:09:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 12:09:29 +0300 |
commit | 3fd97b4bba24ca412112aad025a38a32c7a6cf8c (patch) | |
tree | 4aacc8a184522bcbc3db68df47620bc3d2cfcfd9 /app/assets/javascripts/labels_select.js | |
parent | c52239391bf29f640e1e0af98edbd337c0293940 (diff) |
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 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index b8c8cc91f53..7107c970457 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -495,6 +495,10 @@ export default class LabelsSelect { ].join(''), ); + const rightLabelTextColor = ({ label, escapeStr }) => { + return escapeStr(label.text_color === '#FFFFFF' ? label.color : label.text_color); + }; + const infoIconTemplate = _.template( [ '<a href="<%= scopedLabelsDocumentationLink %>" class="gl-link gl-label-icon" target="_blank" rel="noopener">', @@ -510,7 +514,7 @@ export default class LabelsSelect { spanOpenTag, '<%- label.title.slice(0, label.title.lastIndexOf("::")) %>', '</span>', - '<span class="gl-label-text" style="color: <%= escapeStr(label.color) %>;">', + '<span class="gl-label-text" style="color: <%= rightLabelTextColor({ label, escapeStr }) %>;">', '<%- label.title.slice(label.title.lastIndexOf("::") + 2) %>', '</span>', '</a>', @@ -536,7 +540,7 @@ export default class LabelsSelect { '<% _.each(labels, function(label){ %>', '<% if (isScopedLabel(label) && enableScopedLabels) { %>', '<span class="d-inline-block position-relative scoped-label-wrapper">', - '<%= scopedLabelTemplate({ label, issueUpdateURL, isScopedLabel, enableScopedLabels, infoIconTemplate, scopedLabelsDocumentationLink, tooltipTitleTemplate, escapeStr, linkAttrs: \'data-html="true"\' }) %>', + '<%= scopedLabelTemplate({ label, issueUpdateURL, isScopedLabel, enableScopedLabels, rightLabelTextColor, infoIconTemplate, scopedLabelsDocumentationLink, tooltipTitleTemplate, escapeStr, linkAttrs: \'data-html="true"\' }) %>', '</span>', '<% } else { %>', '<%= labelTemplate({ label, issueUpdateURL, isScopedLabel, enableScopedLabels, tooltipTitleTemplate, escapeStr, linkAttrs: "" }) %>', @@ -548,6 +552,7 @@ export default class LabelsSelect { return tpl({ ...tplData, labelTemplate, + rightLabelTextColor, infoIconTemplate, scopedLabelTemplate, tooltipTitleTemplate, |