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
b6762723
Commit
b6762723
authored
Jun 05, 2021
by
Marcel van Remmerden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add title and tooltip to diff preferences dropdown
Changelog: added
parent
c9a19a21
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
5 deletions
+16
-5
app/assets/javascripts/diffs/components/settings_dropdown.vue
...assets/javascripts/diffs/components/settings_dropdown.vue
+15
-2
app/assets/javascripts/diffs/i18n.js
app/assets/javascripts/diffs/i18n.js
+1
-0
locale/gitlab.pot
locale/gitlab.pot
+0
-3
No files found.
app/assets/javascripts/diffs/components/settings_dropdown.vue
View file @
b6762723
<
script
>
<
script
>
import
{
GlButtonGroup
,
GlButton
,
GlDropdown
,
GlFormCheckbox
}
from
'
@gitlab/ui
'
;
import
{
GlButtonGroup
,
GlButton
,
GlDropdown
,
GlFormCheckbox
,
GlTooltipDirective
,
}
from
'
@gitlab/ui
'
;
import
{
mapActions
,
mapGetters
,
mapState
}
from
'
vuex
'
;
import
{
mapActions
,
mapGetters
,
mapState
}
from
'
vuex
'
;
import
{
SETTINGS_DROPDOWN
}
from
'
../i18n
'
;
import
{
SETTINGS_DROPDOWN
}
from
'
../i18n
'
;
export
default
{
export
default
{
i18n
:
SETTINGS_DROPDOWN
,
i18n
:
SETTINGS_DROPDOWN
,
directives
:
{
GlTooltip
:
GlTooltipDirective
,
},
components
:
{
components
:
{
GlButtonGroup
,
GlButtonGroup
,
GlButton
,
GlButton
,
...
@@ -35,9 +44,13 @@ export default {
...
@@ -35,9 +44,13 @@ export default {
<
template
>
<
template
>
<gl-dropdown
<gl-dropdown
v-gl-tooltip
icon=
"settings"
icon=
"settings"
:text=
"__('Diff view settings')"
:title=
"$options.i18n.preferences"
:text=
"$options.i18n.preferences"
:text-sr-only=
"true"
:text-sr-only=
"true"
:aria-label=
"$options.i18n.preferences"
:header-text=
"$options.i18n.preferences"
toggle-class=
"js-show-diff-settings"
toggle-class=
"js-show-diff-settings"
right
right
>
>
...
...
app/assets/javascripts/diffs/i18n.js
View file @
b6762723
...
@@ -23,4 +23,5 @@ export const DIFF_FILE = {
...
@@ -23,4 +23,5 @@ export const DIFF_FILE = {
export
const
SETTINGS_DROPDOWN
=
{
export
const
SETTINGS_DROPDOWN
=
{
whitespace
:
__
(
'
Show whitespace changes
'
),
whitespace
:
__
(
'
Show whitespace changes
'
),
fileByFile
:
__
(
'
Show one file at a time
'
),
fileByFile
:
__
(
'
Show one file at a time
'
),
preferences
:
__
(
'
Preferences
'
),
};
};
locale/gitlab.pot
View file @
b6762723
...
@@ -11459,9 +11459,6 @@ msgstr ""
...
@@ -11459,9 +11459,6 @@ msgstr ""
msgid "Diff limits"
msgid "Diff limits"
msgstr ""
msgstr ""
msgid "Diff view settings"
msgstr ""
msgid "Difference between start date and now"
msgid "Difference between start date and now"
msgstr ""
msgstr ""
...
...
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