summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide/components/commit_sidebar/message_field.vue
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-04-16 15:08:04 +0100
committerPhil Hughes <me@iamphill.com>2018-04-16 15:08:04 +0100
commitbcb5725d9aa4fdbbf4fdad266c72a2078fa336b5 (patch)
treed55aaaa26ad42bb8f15b1315f67b85d889fa355f /app/assets/javascripts/ide/components/commit_sidebar/message_field.vue
parent5f5995dd268b819f8c7e8be59fab94d966957b47 (diff)
downloadgitlab-ce-bcb5725d9aa4fdbbf4fdad266c72a2078fa336b5.tar.gz
updates to component
Diffstat (limited to 'app/assets/javascripts/ide/components/commit_sidebar/message_field.vue')
-rw-r--r--app/assets/javascripts/ide/components/commit_sidebar/message_field.vue31
1 files changed, 17 insertions, 14 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/message_field.vue b/app/assets/javascripts/ide/components/commit_sidebar/message_field.vue
index 7791e059458..d9f436c0261 100644
--- a/app/assets/javascripts/ide/components/commit_sidebar/message_field.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/message_field.vue
@@ -1,14 +1,16 @@
<script>
-import { __ } from '../../../locale';
+import { __, sprintf } from '../../../locale';
+import Icon from '../../../vue_shared/components/icon.vue';
import popover from '../../../vue_shared/directives/popover';
-
-export const MAX_TITLE_LENGTH = 50;
-export const MAX_BODY_LENGTH = 72;
+import { MAX_TITLE_LENGTH, MAX_BODY_LENGTH } from '../../constants';
export default {
directives: {
popover,
},
+ components: {
+ Icon,
+ },
props: {
text: {
type: String,
@@ -45,13 +47,15 @@ export default {
},
},
popoverOptions: {
- html: true,
trigger: 'hover',
placement: 'top',
- content: __(`
- The character highligher helps you keep the subject line to 50 characters
- and wrap the body at 72 so they are readable in git.
- `),
+ content: sprintf(
+ __(`
+ The character highligher helps you keep the subject line to %{titleLength} characters
+ and wrap the body at %{bodyLength} so they are readable in git.
+ `),
+ { titleLength: MAX_TITLE_LENGTH, bodyLength: MAX_BODY_LENGTH },
+ ),
},
};
</script>
@@ -75,10 +79,9 @@ export default {
v-popover="$options.popoverOptions"
class="help-block prepend-left-10"
>
- <i
- aria-hidden="true"
- class="fa fa-question-circle"
- ></i>
+ <icon
+ name="question"
+ />
</span>
</li>
</ul>
@@ -99,7 +102,7 @@ export default {
v-text="line.substr(0, getLineLength(index)) || ' '"
>
</span><mark
- v-if="line.length > getLineLength(index)"
+ v-show="line.length > getLineLength(index)"
v-text="line.substr(getLineLength(index))"
>
</mark>