diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2017-03-23 03:03:39 +0000 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-23 03:03:39 +0000 |
commit | ad369a9609a9a2b68815204537405134eaabd6cd (patch) | |
tree | b3baee8a9f649d72247a4fd78371309175c998af | |
parent | 011664fdd1b0352074f0a6ee666f99a464ebf813 (diff) | |
download | gitlab-ce-ad369a9609a9a2b68815204537405134eaabd6cd.tar.gz |
Fix `Ctrl+Enter` support for Quick Submit
-rw-r--r-- | app/assets/javascripts/shortcuts.js | 4 | ||||
-rw-r--r-- | changelogs/unreleased/29550-fix-quick-submit-on-preview.yml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/javascripts/shortcuts.js b/app/assets/javascripts/shortcuts.js index 81766f4bd55..fd5097696ad 100644 --- a/app/assets/javascripts/shortcuts.js +++ b/app/assets/javascripts/shortcuts.js @@ -33,6 +33,10 @@ }; Shortcuts.prototype.toggleMarkdownPreview = function(e) { + // Check if short-cut was triggered while in Write Mode + if ($(e.target).hasClass('js-note-text')) { + $('.js-md-preview-button').focus(); + } return $(document).triggerHandler('markdown-preview:toggle', [e]); }; diff --git a/changelogs/unreleased/29550-fix-quick-submit-on-preview.yml b/changelogs/unreleased/29550-fix-quick-submit-on-preview.yml new file mode 100644 index 00000000000..71214971ffd --- /dev/null +++ b/changelogs/unreleased/29550-fix-quick-submit-on-preview.yml @@ -0,0 +1,4 @@ +--- +title: Fix quick submit short-cut on preview tab for comments +merge_request: 10002 +author: |