diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-30 13:58:50 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-30 13:58:50 +0300 |
| commit | df7c90116ba1203f1cb1150bb99fa5a4c99e0280 (patch) | |
| tree | 85c6c5ed86f2372ff3ebdfc6a888cbf7540a44dc /app/assets/javascripts/vue_shared | |
| parent | 3465e1e52c812a4a4f4fe941ab04569ebf2a2c12 (diff) | |
fixed issuable shortcuts not working
moved setstate method into store
Diffstat (limited to 'app/assets/javascripts/vue_shared')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/field.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/header.vue | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue index fe9f4993d33..e6977681e96 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/field.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue @@ -69,7 +69,7 @@ <template> <div - class="md-area prepend-top-default append-bottom-default" + class="md-area prepend-top-default append-bottom-default js-vue-markdown-field" ref="gl-form"> <markdown-header :preview-markdown="previewMarkdown" diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue index 7884b25c5ef..1a11f493b7f 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/header.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue @@ -16,12 +16,24 @@ toolbarButton, }, methods: { - toggleMarkdownPreview(e) { - e.target.blur(); + toggleMarkdownPreview(e, form) { + if (form && !form.find('.js-vue-markdown-field').length) { + return; + } else if (e.target.blur) { + e.target.blur(); + } this.$emit('toggle-markdown'); }, }, + mounted() { + $(document).on('markdown-preview:show.vue', this.toggleMarkdownPreview); + $(document).on('markdown-preview:hide.vue', this.toggleMarkdownPreview); + }, + beforeDestroy() { + $(document).on('markdown-preview:show.vue', this.toggleMarkdownPreview); + $(document).off('markdown-preview:hide.vue', this.toggleMarkdownPreview); + }, }; </script> |