diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-03-16 23:16:21 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-03-16 23:16:21 +0300 |
| commit | fdc9ae2edf8a7674e157599cff12fbeaec53f7e2 (patch) | |
| tree | c99d5c680943a83ab05a05ed204b3553e055ddc4 /app/assets/javascripts/notes/mixins | |
| parent | 2c792c7572502807508add213be70db1b81685d4 (diff) | |
| download | gitlab-ce-fdc9ae2edf8a7674e157599cff12fbeaec53f7e2.tar.gz | |
Prettify notes.
Diffstat (limited to 'app/assets/javascripts/notes/mixins')
| -rw-r--r-- | app/assets/javascripts/notes/mixins/autosave.js | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/notes/mixins/resolvable.js | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/app/assets/javascripts/notes/mixins/autosave.js b/app/assets/javascripts/notes/mixins/autosave.js index 837a4029346..3dff715905f 100644 --- a/app/assets/javascripts/notes/mixins/autosave.js +++ b/app/assets/javascripts/notes/mixins/autosave.js @@ -5,7 +5,11 @@ import { capitalizeFirstCharacter } from '../../lib/utils/text_utility'; export default { methods: { initAutoSave(noteableType) { - this.autosave = new Autosave($(this.$refs.noteForm.$refs.textarea), ['Note', capitalizeFirstCharacter(noteableType), this.note.id]); + this.autosave = new Autosave($(this.$refs.noteForm.$refs.textarea), [ + 'Note', + capitalizeFirstCharacter(noteableType), + this.note.id, + ]); }, resetAutoSave() { this.autosave.reset(); diff --git a/app/assets/javascripts/notes/mixins/resolvable.js b/app/assets/javascripts/notes/mixins/resolvable.js index ab1ae115e52..f79049b85f6 100644 --- a/app/assets/javascripts/notes/mixins/resolvable.js +++ b/app/assets/javascripts/notes/mixins/resolvable.js @@ -12,7 +12,8 @@ export default { discussionResolved() { const { notes, resolved } = this.note; - if (notes) { // Decide resolved state using store. Only valid for discussions. + if (notes) { + // Decide resolved state using store. Only valid for discussions. return notes.every(note => note.resolved && !note.system); } @@ -26,7 +27,9 @@ export default { return __('Comment and resolve discussion'); } - return this.discussionResolved ? __('Unresolve discussion') : __('Resolve discussion'); + return this.discussionResolved + ? __('Unresolve discussion') + : __('Resolve discussion'); }, }, methods: { @@ -42,7 +45,9 @@ export default { }) .catch(() => { this.isResolving = false; - const msg = __('Something went wrong while resolving this discussion. Please try again.'); + const msg = __( + 'Something went wrong while resolving this discussion. Please try again.', + ); Flash(msg, 'alert', this.$el); }); }, |