diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-02-26 19:22:02 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-02-26 19:22:02 +0300 |
commit | 3d493cee077d7bf5591c311042ad03c08094effb (patch) | |
tree | 9f7f61c4778523bc782f6ff1bdef206ee27ffae4 /app | |
parent | 78ed5c0f30478b6ecdb58c9bcb335f758acd8a9b (diff) | |
parent | 34c7938804729bc8860096a3ae13450cd3102476 (diff) |
Merge branch 'issue-edit-shortcut' into 'master'
Fixed issue edit shortcut not working
Closes #43560
See merge request gitlab-org/gitlab-ce!17360
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/shortcuts_issuable.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/shortcuts_issuable.js b/app/assets/javascripts/shortcuts_issuable.js index 689befc742e..14545824e74 100644 --- a/app/assets/javascripts/shortcuts_issuable.js +++ b/app/assets/javascripts/shortcuts_issuable.js @@ -9,13 +9,12 @@ export default class ShortcutsIssuable extends Shortcuts { super(); this.$replyField = isMergeRequest ? $('.js-main-target-form #note_note') : $('.js-main-target-form .js-vue-comment-form'); - this.editBtn = document.querySelector('.js-issuable-edit'); Mousetrap.bind('a', () => ShortcutsIssuable.openSidebarDropdown('assignee')); Mousetrap.bind('m', () => ShortcutsIssuable.openSidebarDropdown('milestone')); Mousetrap.bind('l', () => ShortcutsIssuable.openSidebarDropdown('labels')); Mousetrap.bind('r', this.replyWithSelectedText.bind(this)); - Mousetrap.bind('e', this.editIssue.bind(this)); + Mousetrap.bind('e', ShortcutsIssuable.editIssue); if (isMergeRequest) { this.enabledHelp.push('.hidden-shortcut.merge_requests'); @@ -58,10 +57,10 @@ export default class ShortcutsIssuable extends Shortcuts { return false; } - editIssue() { + static editIssue() { // Need to click the element as on issues, editing is inline // on merge request, editing is on a different page - this.editBtn.click(); + document.querySelector('.js-issuable-edit').click(); return false; } |