diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-04-21 17:02:07 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-04-21 17:02:07 +0000 |
| commit | 9c35162f83fb62349b922baaf192038522b09793 (patch) | |
| tree | 9b42992681911f991bfeaa80e947a1bde6bf475c /app/assets | |
| parent | d3a788da5b3871331b967e692d78a808a31f08fa (diff) | |
| parent | f5f97359456bff5226f55f5338e01120ea90cbb8 (diff) | |
| download | gitlab-ce-9c35162f83fb62349b922baaf192038522b09793.tar.gz | |
Merge branch 'form-focus-previous-incorrect-form' into 'master'
Fixed the preview keyboard shortcut focusing wrong tab
Closes #31101
See merge request !10849
Diffstat (limited to 'app/assets')
| -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]); }; |