From f682bf5bb5defebba3886dda011ffdff5ff7a9d1 Mon Sep 17 00:00:00 2001 From: Mark Florian <mflorian@gitlab.com> Date: Wed, 12 Apr 2023 17:06:50 +0100 Subject: [PATCH] chore: Remove dead code due to unused arguments - The skipResetBindings constructor parameter was removed in 4ee29e897d38b1d8b31fce8d197270265a0a6f72, so all related code can be removed. - The ShortcutsEpic.openSidebarDropdown static method's only parameter was removed in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75302, so there's no point passing anything to it. - The ShortcutsTestCase.openSidebarDropdown static method never expected any parameters since creation in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109527, so there's no point passing anything to it. --- .../javascripts/behaviors/shortcuts/shortcuts_blob.js | 3 +-- app/assets/javascripts/pages/projects/init_blob.js | 1 - .../javascripts/repository/components/blob_controls.vue | 1 - .../javascripts/behaviors/shortcuts/shortcuts_epic.js | 7 +------ .../javascripts/behaviors/shortcuts/shortcuts_test_case.js | 7 +------ 5 files changed, 3 insertions(+), 16 deletions(-) diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js index ab7fcbb35f15d..b6dc91bb2ad44 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 097b2f33aa99e..244d1d5590e82 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 d3e306619bfa1..460db0fe2aec2 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 77231a3973547..ebea9ff8c6672 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 3e0fd188e0bc2..6c30df8e68537 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() { -- GitLab