diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-05-16 15:17:29 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-05-16 15:17:29 +0000 |
commit | 0795742fef8c6313e1daa7cff82f4af76b4caeb5 (patch) | |
tree | 4c14a6cc1fff6402deb4cd342934eb90db863e13 /app/assets/javascripts | |
parent | bc852e05e388b6f85462a89bf395f74cf16a97de (diff) | |
parent | 10074ecea0e440369d64cdb02b1c8138c38446d1 (diff) | |
download | gitlab-ce-0795742fef8c6313e1daa7cff82f4af76b4caeb5.tar.gz |
Merge branch 'diff-filter-bar-placeholder-text' into 'master'
Changed the placeholder text of the diff tree filter input
Closes #58339
See merge request gitlab-org/gitlab-ce!28352
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/diffs/components/tree_list.vue | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/tree_list.vue b/app/assets/javascripts/diffs/components/tree_list.vue index 384f33e0983..30be2e68e76 100644 --- a/app/assets/javascripts/diffs/components/tree_list.vue +++ b/app/assets/javascripts/diffs/components/tree_list.vue @@ -1,6 +1,7 @@ <script> import { mapActions, mapGetters, mapState } from 'vuex'; import { GlTooltipDirective } from '@gitlab/ui'; +import { s__, sprintf } from '~/locale'; import Icon from '~/vue_shared/components/icon.vue'; import FileRow from '~/vue_shared/components/file_row.vue'; import FileRowStats from './file_row_stats.vue'; @@ -57,6 +58,9 @@ export default { this.search = ''; }, }, + searchPlaceholder: sprintf(s__('MergeRequest|Filter files or search with %{modifier_key}+p'), { + modifier_key: /Mac/i.test(navigator.userAgent) ? 'cmd' : 'ctrl', + }), }; </script> @@ -65,10 +69,13 @@ export default { <div class="append-bottom-8 position-relative tree-list-search d-flex"> <div class="flex-fill d-flex"> <icon name="search" class="position-absolute tree-list-icon" /> + <label for="diff-tree-search" class="sr-only">{{ $options.searchPlaceholder }}</label> <input + id="diff-tree-search" v-model="search" - :placeholder="s__('MergeRequest|Filter files')" + :placeholder="$options.searchPlaceholder" type="search" + name="diff-tree-search" class="form-control" /> <button |