diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js index ab7fcbb35f15dbb2c47dca4af3dc5deaf5d2b5d2..b6dc91bb2ad44ad3a01fc2ab752a250d4602860b 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js @@ -11,7 +11,6 @@ import { updateRefPortionOfTitle } from '~/repository/utils/title'; import Shortcuts from './shortcuts'; const defaults = { - skipResetBindings: false, fileBlobPermalinkUrl: null, fileBlobPermalinkUrlElement: null, }; @@ -24,7 +23,7 @@ function eventHasModifierKeys(event) { export default class ShortcutsBlob extends Shortcuts { constructor(opts) { const options = { ...defaults, ...opts }; - super(options.skipResetBindings); + super(); this.options = options; this.shortcircuitPermalinkButton(); diff --git a/app/assets/javascripts/pages/projects/init_blob.js b/app/assets/javascripts/pages/projects/init_blob.js index 097b2f33aa99e929f52b4260fcf1c05dcc9f42c7..244d1d5590e8215ca8982feaf6d20c8a37727549 100644 --- a/app/assets/javascripts/pages/projects/init_blob.js +++ b/app/assets/javascripts/pages/projects/init_blob.js @@ -22,7 +22,6 @@ export default () => { // eslint-disable-next-line no-new new ShortcutsBlob({ - skipResetBindings: true, fileBlobPermalinkUrl, fileBlobPermalinkUrlElement, }); diff --git a/app/assets/javascripts/repository/components/blob_controls.vue b/app/assets/javascripts/repository/components/blob_controls.vue index d3e306619bfa1f36724fe027bb7a8ec8d5d76a9f..460db0fe2aec22d6e03b04125bef4143ef8c7cee 100644 --- a/app/assets/javascripts/repository/components/blob_controls.vue +++ b/app/assets/javascripts/repository/components/blob_controls.vue @@ -101,7 +101,6 @@ export default { fileBlobPermalinkUrlElement && fileBlobPermalinkUrlElement.getAttribute('href'); // eslint-disable-next-line no-new new ShortcutsBlob({ - skipResetBindings: true, fileBlobPermalinkUrl, fileBlobPermalinkUrlElement, }); diff --git a/ee/app/assets/javascripts/behaviors/shortcuts/shortcuts_epic.js b/ee/app/assets/javascripts/behaviors/shortcuts/shortcuts_epic.js index 77231a3973547a0d34982a1d44f0ba9aac0f7947..ebea9ff8c667216c1d1a58ec43deb12bd1b56ba4 100644 --- a/ee/app/assets/javascripts/behaviors/shortcuts/shortcuts_epic.js +++ b/ee/app/assets/javascripts/behaviors/shortcuts/shortcuts_epic.js @@ -1,4 +1,3 @@ -import $ from 'jquery'; import Mousetrap from 'mousetrap'; import { keysFor, @@ -12,11 +11,7 @@ export default class ShortcutsEpic extends ShortcutsIssuable { constructor() { super(); - const $issuableSidebar = $('.js-issuable-update'); - - Mousetrap.bind(keysFor(ISSUABLE_CHANGE_LABEL), () => - ShortcutsEpic.openSidebarDropdown($issuableSidebar.find('.js-labels-block')), - ); + Mousetrap.bind(keysFor(ISSUABLE_CHANGE_LABEL), ShortcutsEpic.openSidebarDropdown); Mousetrap.bind(keysFor(ISSUABLE_COMMENT_OR_REPLY), ShortcutsIssuable.replyWithSelectedText); Mousetrap.bind(keysFor(ISSUABLE_EDIT_DESCRIPTION), ShortcutsIssuable.editIssue); } diff --git a/ee/app/assets/javascripts/behaviors/shortcuts/shortcuts_test_case.js b/ee/app/assets/javascripts/behaviors/shortcuts/shortcuts_test_case.js index 3e0fd188e0bc20760c8b9686beba96f2bb868fac..6c30df8e68537d7921bce4447d876558cbd94fae 100644 --- a/ee/app/assets/javascripts/behaviors/shortcuts/shortcuts_test_case.js +++ b/ee/app/assets/javascripts/behaviors/shortcuts/shortcuts_test_case.js @@ -1,4 +1,3 @@ -import $ from 'jquery'; import Mousetrap from 'mousetrap'; import { keysFor, ISSUABLE_CHANGE_LABEL } from '~/behaviors/shortcuts/keybindings'; import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable'; @@ -7,11 +6,7 @@ export default class ShortcutsTestCase extends ShortcutsIssuable { constructor() { super(); - const $issuableSidebar = $('.issuable-sidebar'); - - Mousetrap.bind(keysFor(ISSUABLE_CHANGE_LABEL), () => - ShortcutsTestCase.openSidebarDropdown($issuableSidebar.find('.js-labels-block')), - ); + Mousetrap.bind(keysFor(ISSUABLE_CHANGE_LABEL), ShortcutsTestCase.openSidebarDropdown); } static openSidebarDropdown() {