diff options
author | Phil Hughes <me@iamphill.com> | 2017-04-21 14:19:08 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-04-21 14:19:08 +0100 |
commit | b8a96fda9c2a36aab6af603bf376fc97c19c2bca (patch) | |
tree | d505e87b0b3928e6533ca9d77ace51d16f56a97f /app/assets/javascripts/shortcuts.js | |
parent | f09f753908a001e791a254d277032734f6fe57b6 (diff) | |
download | gitlab-ce-b8a96fda9c2a36aab6af603bf376fc97c19c2bca.tar.gz |
Fixed the preview keyboard shortcut focusing wrong tab
Closes #31101
Diffstat (limited to 'app/assets/javascripts/shortcuts.js')
-rw-r--r-- | app/assets/javascripts/shortcuts.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/shortcuts.js b/app/assets/javascripts/shortcuts.js index 5b6bb2bf3f5..85659d7fa39 100644 --- a/app/assets/javascripts/shortcuts.js +++ b/app/assets/javascripts/shortcuts.js @@ -57,8 +57,11 @@ import findAndFollowLink from './shortcuts_dashboard_navigation'; 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(); + const $target = $(e.target); + const $form = $target.closest('form'); + + if ($target.hasClass('js-note-text')) { + $('.js-md-preview-button', $form).focus(); } return $(document).triggerHandler('markdown-preview:toggle', [e]); }; |