diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-12 10:52:23 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-12 10:52:23 +0000 |
commit | 2ef39a80410540995fe3f64bf38ae0f0adb9fc0f (patch) | |
tree | 6a89b1824b179fec99587ef5d14de7d2ed38a402 /app/assets/javascripts | |
parent | ba5b53954872c8ef1804a6111d08ebc8d72f57a3 (diff) | |
parent | 20ddfd9c5992a23ad394a690d194a1009ec3fd26 (diff) | |
download | gitlab-ce-2ef39a80410540995fe3f64bf38ae0f0adb9fc0f.tar.gz |
Merge branch 'add-js-prefix-issuable-edit' into 'master'
Add js prefix for issuable-edit
Closes #40965
See merge request gitlab-org/gitlab-ce!15813
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/issue_show/index.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/shortcuts_issuable.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/issue_show/index.js b/app/assets/javascripts/issue_show/index.js index a21ce41e65e..7b762496ba5 100644 --- a/app/assets/javascripts/issue_show/index.js +++ b/app/assets/javascripts/issue_show/index.js @@ -7,7 +7,7 @@ document.addEventListener('DOMContentLoaded', () => { const initialDataEl = document.getElementById('js-issuable-app-initial-data'); const props = JSON.parse(initialDataEl.innerHTML.replace(/"/g, '"')); - $('.issuable-edit').on('click', (e) => { + $('.js-issuable-edit').on('click', (e) => { e.preventDefault(); eventHub.$emit('open.form'); diff --git a/app/assets/javascripts/shortcuts_issuable.js b/app/assets/javascripts/shortcuts_issuable.js index 4f4f606d293..305f97b010e 100644 --- a/app/assets/javascripts/shortcuts_issuable.js +++ b/app/assets/javascripts/shortcuts_issuable.js @@ -11,7 +11,7 @@ export default class ShortcutsIssuable extends ShortcutsNavigation { super(); this.$replyField = isMergeRequest ? $('.js-main-target-form #note_note') : $('.js-main-target-form .js-vue-comment-form'); - this.editBtn = document.querySelector('.issuable-edit'); + this.editBtn = document.querySelector('.js-issuable-edit'); Mousetrap.bind('a', () => ShortcutsIssuable.openSidebarDropdown('assignee')); Mousetrap.bind('m', () => ShortcutsIssuable.openSidebarDropdown('milestone')); |