diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 13:18:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 13:18:24 +0000 |
| commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
| tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /app/assets/javascripts/right_sidebar.js | |
| parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) | |
| download | gitlab-ce-0653e08efd039a5905f3fa4f6e9cef9f5d2f799c.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/assets/javascripts/right_sidebar.js')
| -rw-r--r-- | app/assets/javascripts/right_sidebar.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/right_sidebar.js b/app/assets/javascripts/right_sidebar.js index 36f5e6f4ce1..23254fcc2eb 100644 --- a/app/assets/javascripts/right_sidebar.js +++ b/app/assets/javascripts/right_sidebar.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import Cookies from 'js-cookie'; -import { hide } from '~/tooltips'; +import { hide, fixTitle } from '~/tooltips'; import createFlash from './flash'; import axios from './lib/utils/axios_utils'; import { sprintf, s__, __ } from './locale'; @@ -75,6 +75,9 @@ Sidebar.prototype.sidebarToggleClicked = function (e, triggered) { } $this.attr('data-original-title', tooltipLabel); + $this.attr('title', tooltipLabel); + fixTitle($this); + hide($this); if (!triggered) { Cookies.set('collapsed_gutter', $('.right-sidebar').hasClass('right-sidebar-collapsed')); @@ -99,7 +102,7 @@ Sidebar.prototype.toggleTodo = function (e) { }) .catch(() => createFlash({ - message: sprintf(__('There was an error %{message} todo.'), { + message: sprintf(__('There was an error %{message} to-do item.'), { message: ajaxType === 'post' ? s__('RightSidebar|adding a') : s__('RightSidebar|deleting the'), }), |