summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/shortcuts.js4
-rw-r--r--changelogs/unreleased/29550-fix-quick-submit-on-preview.yml4
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: