From 196dfd2627fec6c0ede1d7df0dd49881b2bbd898 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Tue, 18 Sep 2018 15:34:14 -0500 Subject: Move shortcuts classes into behaviors/shortcuts --- app/assets/javascripts/behaviors/shortcuts.js | 2 +- .../javascripts/behaviors/shortcuts/shortcuts.js | 124 +++++++++++++++++++++ .../behaviors/shortcuts/shortcuts_blob.js | 26 +++++ .../behaviors/shortcuts/shortcuts_find_file.js | 29 +++++ .../behaviors/shortcuts/shortcuts_issuable.js | 77 +++++++++++++ .../behaviors/shortcuts/shortcuts_navigation.js | 28 +++++ .../behaviors/shortcuts/shortcuts_network.js | 17 +++ .../behaviors/shortcuts/shortcuts_wiki.js | 14 +++ .../javascripts/pages/groups/boards/index.js | 2 +- app/assets/javascripts/pages/groups/show/index.js | 2 +- .../javascripts/pages/projects/activity/index.js | 2 +- .../pages/projects/artifacts/browse/index.js | 2 +- .../pages/projects/artifacts/file/index.js | 2 +- .../javascripts/pages/projects/boards/index.js | 2 +- .../pages/projects/commit/show/index.js | 2 +- .../pages/projects/commits/show/index.js | 2 +- .../pages/projects/find_file/show/index.js | 2 +- app/assets/javascripts/pages/projects/index.js | 2 +- app/assets/javascripts/pages/projects/init_blob.js | 4 +- .../javascripts/pages/projects/issues/form.js | 2 +- .../pages/projects/issues/index/index.js | 2 +- .../javascripts/pages/projects/issues/show.js | 2 +- .../pages/projects/merge_requests/index/index.js | 2 +- .../projects/merge_requests/init_merge_request.js | 2 +- .../merge_requests/init_merge_request_show.js | 2 +- .../pages/projects/network/show/index.js | 2 +- .../javascripts/pages/projects/show/index.js | 2 +- .../javascripts/pages/projects/tree/show/index.js | 2 +- .../javascripts/pages/projects/wikis/index.js | 2 +- app/assets/javascripts/shortcuts.js | 124 --------------------- app/assets/javascripts/shortcuts_blob.js | 26 ----- app/assets/javascripts/shortcuts_find_file.js | 29 ----- app/assets/javascripts/shortcuts_issuable.js | 77 ------------- app/assets/javascripts/shortcuts_navigation.js | 28 ----- app/assets/javascripts/shortcuts_network.js | 17 --- app/assets/javascripts/shortcuts_wiki.js | 14 --- 36 files changed, 338 insertions(+), 338 deletions(-) create mode 100644 app/assets/javascripts/behaviors/shortcuts/shortcuts.js create mode 100644 app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js create mode 100644 app/assets/javascripts/behaviors/shortcuts/shortcuts_find_file.js create mode 100644 app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js create mode 100644 app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js create mode 100644 app/assets/javascripts/behaviors/shortcuts/shortcuts_network.js create mode 100644 app/assets/javascripts/behaviors/shortcuts/shortcuts_wiki.js delete mode 100644 app/assets/javascripts/shortcuts.js delete mode 100644 app/assets/javascripts/shortcuts_blob.js delete mode 100644 app/assets/javascripts/shortcuts_find_file.js delete mode 100644 app/assets/javascripts/shortcuts_issuable.js delete mode 100644 app/assets/javascripts/shortcuts_navigation.js delete mode 100644 app/assets/javascripts/shortcuts_network.js delete mode 100644 app/assets/javascripts/shortcuts_wiki.js (limited to 'app/assets') diff --git a/app/assets/javascripts/behaviors/shortcuts.js b/app/assets/javascripts/behaviors/shortcuts.js index 16c76aedf89..7987a533ae5 100644 --- a/app/assets/javascripts/behaviors/shortcuts.js +++ b/app/assets/javascripts/behaviors/shortcuts.js @@ -1,4 +1,4 @@ -import Shortcuts from '../shortcuts'; +import Shortcuts from './shortcuts/shortcuts'; export default function initPageShortcuts() { const { page } = document.body.dataset; diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js new file mode 100644 index 00000000000..6719bfd6d22 --- /dev/null +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js @@ -0,0 +1,124 @@ +import $ from 'jquery'; +import Cookies from 'js-cookie'; +import Mousetrap from 'mousetrap'; +import axios from '../../lib/utils/axios_utils'; +import { refreshCurrentPage, visitUrl } from '../../lib/utils/url_utility'; +import findAndFollowLink from '../../lib/utils/navigation_utility'; + +const defaultStopCallback = Mousetrap.stopCallback; +Mousetrap.stopCallback = (e, element, combo) => { + if (['ctrl+shift+p', 'command+shift+p'].indexOf(combo) !== -1) { + return false; + } + + return defaultStopCallback(e, element, combo); +}; + +export default class Shortcuts { + constructor() { + this.onToggleHelp = this.onToggleHelp.bind(this); + this.enabledHelp = []; + + Mousetrap.bind('?', this.onToggleHelp); + Mousetrap.bind('s', Shortcuts.focusSearch); + Mousetrap.bind('f', this.focusFilter.bind(this)); + Mousetrap.bind('p b', Shortcuts.onTogglePerfBar); + + const findFileURL = document.body.dataset.findFile; + + Mousetrap.bind('shift+t', () => findAndFollowLink('.shortcuts-todos')); + Mousetrap.bind('shift+a', () => findAndFollowLink('.dashboard-shortcuts-activity')); + Mousetrap.bind('shift+i', () => findAndFollowLink('.dashboard-shortcuts-issues')); + Mousetrap.bind('shift+m', () => findAndFollowLink('.dashboard-shortcuts-merge_requests')); + Mousetrap.bind('shift+p', () => findAndFollowLink('.dashboard-shortcuts-projects')); + Mousetrap.bind('shift+g', () => findAndFollowLink('.dashboard-shortcuts-groups')); + Mousetrap.bind('shift+l', () => findAndFollowLink('.dashboard-shortcuts-milestones')); + Mousetrap.bind('shift+s', () => findAndFollowLink('.dashboard-shortcuts-snippets')); + + Mousetrap.bind(['ctrl+shift+p', 'command+shift+p'], Shortcuts.toggleMarkdownPreview); + + if (typeof findFileURL !== 'undefined' && findFileURL !== null) { + Mousetrap.bind('t', () => { + visitUrl(findFileURL); + }); + } + + $(document).on('click.more_help', '.js-more-help-button', function clickMoreHelp(e) { + $(this).remove(); + $('.hidden-shortcut').show(); + e.preventDefault(); + }); + } + + onToggleHelp(e) { + if (e.preventDefault) { + e.preventDefault(); + } + + Shortcuts.toggleHelp(this.enabledHelp); + } + + static onTogglePerfBar(e) { + e.preventDefault(); + const performanceBarCookieName = 'perf_bar_enabled'; + if (Cookies.get(performanceBarCookieName) === 'true') { + Cookies.set(performanceBarCookieName, 'false', { path: '/' }); + } else { + Cookies.set(performanceBarCookieName, 'true', { path: '/' }); + } + refreshCurrentPage(); + } + + static toggleMarkdownPreview(e) { + // Check if short-cut was triggered while in Write Mode + const $target = $(e.target); + const $form = $target.closest('form'); + + if ($target.hasClass('js-note-text')) { + $('.js-md-preview-button', $form).focus(); + } + $(document).triggerHandler('markdown-preview:toggle', [e]); + } + + static toggleHelp(location) { + const $modal = $('#modal-shortcuts'); + + if ($modal.length) { + $modal.modal('toggle'); + return null; + } + + return axios.get(gon.shortcuts_path, { + responseType: 'text', + }).then(({ data }) => { + $.globalEval(data); + + if (location && location.length > 0) { + const results = []; + for (let i = 0, len = location.length; i < len; i += 1) { + results.push($(location[i]).show()); + } + return results; + } + + $('.hidden-shortcut').show(); + return $('.js-more-help-button').remove(); + }); + } + + focusFilter(e) { + if (!this.filterInput) { + this.filterInput = $('input[type=search]', '.nav-controls'); + } + this.filterInput.focus(); + e.preventDefault(); + } + + static focusSearch(e) { + $('#search').focus(); + + if (e.preventDefault) { + e.preventDefault(); + } + } +} diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js new file mode 100644 index 00000000000..052e33b4a2b --- /dev/null +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_blob.js @@ -0,0 +1,26 @@ +import Mousetrap from 'mousetrap'; +import { getLocationHash, visitUrl } from '../../lib/utils/url_utility'; +import Shortcuts from './shortcuts'; + +const defaults = { + skipResetBindings: false, + fileBlobPermalinkUrl: null, +}; + +export default class ShortcutsBlob extends Shortcuts { + constructor(opts) { + const options = Object.assign({}, defaults, opts); + super(options.skipResetBindings); + this.options = options; + + Mousetrap.bind('y', this.moveToFilePermalink.bind(this)); + } + + moveToFilePermalink() { + if (this.options.fileBlobPermalinkUrl) { + const hash = getLocationHash(); + const hashUrlString = hash ? `#${hash}` : ''; + visitUrl(`${this.options.fileBlobPermalinkUrl}${hashUrlString}`); + } + } +} diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_find_file.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_find_file.js new file mode 100644 index 00000000000..8658081c6c2 --- /dev/null +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_find_file.js @@ -0,0 +1,29 @@ +import Mousetrap from 'mousetrap'; +import ShortcutsNavigation from './shortcuts_navigation'; + +export default class ShortcutsFindFile extends ShortcutsNavigation { + constructor(projectFindFile) { + super(); + + const oldStopCallback = Mousetrap.stopCallback; + this.projectFindFile = projectFindFile; + + Mousetrap.stopCallback = (e, element, combo) => { + if ( + element === this.projectFindFile.inputElement[0] && + (combo === 'up' || combo === 'down' || combo === 'esc' || combo === 'enter') + ) { + // when press up/down key in textbox, cursor prevent to move to home/end + e.preventDefault(); + return false; + } + + return oldStopCallback(e, element, combo); + }; + + Mousetrap.bind('up', this.projectFindFile.selectRowUp); + Mousetrap.bind('down', this.projectFindFile.selectRowDown); + Mousetrap.bind('esc', this.projectFindFile.goToTree); + Mousetrap.bind('enter', this.projectFindFile.goToBlob); + } +} diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js new file mode 100644 index 00000000000..5e48bf5a35c --- /dev/null +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js @@ -0,0 +1,77 @@ +import $ from 'jquery'; +import Mousetrap from 'mousetrap'; +import _ from 'underscore'; +import Sidebar from '../../right_sidebar'; +import Shortcuts from './shortcuts'; +import { CopyAsGFM } from '../markdown/copy_as_gfm'; + +export default class ShortcutsIssuable extends Shortcuts { + constructor(isMergeRequest) { + super(); + + Mousetrap.bind('a', () => ShortcutsIssuable.openSidebarDropdown('assignee')); + Mousetrap.bind('m', () => ShortcutsIssuable.openSidebarDropdown('milestone')); + Mousetrap.bind('l', () => ShortcutsIssuable.openSidebarDropdown('labels')); + Mousetrap.bind('r', ShortcutsIssuable.replyWithSelectedText); + Mousetrap.bind('e', ShortcutsIssuable.editIssue); + + if (isMergeRequest) { + this.enabledHelp.push('.hidden-shortcut.merge_requests'); + } else { + this.enabledHelp.push('.hidden-shortcut.issues'); + } + } + + static replyWithSelectedText() { + const $replyField = $('.js-main-target-form .js-vue-comment-form'); + const documentFragment = window.gl.utils.getSelectedFragment(); + + if (!$replyField.length) { + return false; + } + + if (!documentFragment) { + $replyField.focus(); + return false; + } + + const el = CopyAsGFM.transformGFMSelection(documentFragment.cloneNode(true)); + const selected = CopyAsGFM.nodeToGFM(el); + + if (selected.trim() === '') { + return false; + } + + const quote = _.map(selected.split('\n'), val => `${`> ${val}`.trim()}\n`); + + // If replyField already has some content, add a newline before our quote + const separator = ($replyField.val().trim() !== '' && '\n\n') || ''; + $replyField + .val((a, current) => `${current}${separator}${quote.join('')}\n`) + .trigger('input') + .trigger('change'); + + // Trigger autosize + const event = document.createEvent('Event'); + event.initEvent('autosize:update', true, false); + $replyField.get(0).dispatchEvent(event); + + // Focus the input field + $replyField.focus(); + + return false; + } + + static editIssue() { + // Need to click the element as on issues, editing is inline + // on merge request, editing is on a different page + document.querySelector('.js-issuable-edit').click(); + + return false; + } + + static openSidebarDropdown(name) { + Sidebar.instance.openDropdown(name); + return false; + } +} diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js new file mode 100644 index 00000000000..fa9b2c9f755 --- /dev/null +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js @@ -0,0 +1,28 @@ +import Mousetrap from 'mousetrap'; +import findAndFollowLink from '../../lib/utils/navigation_utility'; +import Shortcuts from './shortcuts'; + +export default class ShortcutsNavigation extends Shortcuts { + constructor() { + super(); + + Mousetrap.bind('g p', () => findAndFollowLink('.shortcuts-project')); + Mousetrap.bind('g v', () => findAndFollowLink('.shortcuts-project-activity')); + Mousetrap.bind('g f', () => findAndFollowLink('.shortcuts-tree')); + Mousetrap.bind('g c', () => findAndFollowLink('.shortcuts-commits')); + Mousetrap.bind('g j', () => findAndFollowLink('.shortcuts-builds')); + Mousetrap.bind('g n', () => findAndFollowLink('.shortcuts-network')); + Mousetrap.bind('g d', () => findAndFollowLink('.shortcuts-repository-charts')); + Mousetrap.bind('g i', () => findAndFollowLink('.shortcuts-issues')); + Mousetrap.bind('g b', () => findAndFollowLink('.shortcuts-issue-boards')); + Mousetrap.bind('g m', () => findAndFollowLink('.shortcuts-merge_requests')); + Mousetrap.bind('g w', () => findAndFollowLink('.shortcuts-wiki')); + Mousetrap.bind('g s', () => findAndFollowLink('.shortcuts-snippets')); + Mousetrap.bind('g k', () => findAndFollowLink('.shortcuts-kubernetes')); + Mousetrap.bind('g e', () => findAndFollowLink('.shortcuts-environments')); + Mousetrap.bind('g l', () => findAndFollowLink('.shortcuts-metrics')); + Mousetrap.bind('i', () => findAndFollowLink('.shortcuts-new-issue')); + + this.enabledHelp.push('.hidden-shortcut.project'); + } +} diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_network.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_network.js new file mode 100644 index 00000000000..a88c280fa3b --- /dev/null +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_network.js @@ -0,0 +1,17 @@ +import Mousetrap from 'mousetrap'; +import ShortcutsNavigation from './shortcuts_navigation'; + +export default class ShortcutsNetwork extends ShortcutsNavigation { + constructor(graph) { + super(); + + Mousetrap.bind(['left', 'h'], graph.scrollLeft); + Mousetrap.bind(['right', 'l'], graph.scrollRight); + Mousetrap.bind(['up', 'k'], graph.scrollUp); + Mousetrap.bind(['down', 'j'], graph.scrollDown); + Mousetrap.bind(['shift+up', 'shift+k'], graph.scrollTop); + Mousetrap.bind(['shift+down', 'shift+j'], graph.scrollBottom); + + this.enabledHelp.push('.hidden-shortcut.network'); + } +} diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_wiki.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_wiki.js new file mode 100644 index 00000000000..8b7e6a56d25 --- /dev/null +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_wiki.js @@ -0,0 +1,14 @@ +import Mousetrap from 'mousetrap'; +import ShortcutsNavigation from './shortcuts_navigation'; +import findAndFollowLink from '../../lib/utils/navigation_utility'; + +export default class ShortcutsWiki extends ShortcutsNavigation { + constructor() { + super(); + Mousetrap.bind('e', ShortcutsWiki.editWiki); + } + + static editWiki() { + findAndFollowLink('.js-wiki-edit'); + } +} diff --git a/app/assets/javascripts/pages/groups/boards/index.js b/app/assets/javascripts/pages/groups/boards/index.js index 5cfe8723204..79c3be771d0 100644 --- a/app/assets/javascripts/pages/groups/boards/index.js +++ b/app/assets/javascripts/pages/groups/boards/index.js @@ -1,5 +1,5 @@ import UsersSelect from '~/users_select'; -import ShortcutsNavigation from '~/shortcuts_navigation'; +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import initBoards from '~/boards'; document.addEventListener('DOMContentLoaded', () => { diff --git a/app/assets/javascripts/pages/groups/show/index.js b/app/assets/javascripts/pages/groups/show/index.js index 5b8c2ae7e81..3a45fd70d02 100644 --- a/app/assets/javascripts/pages/groups/show/index.js +++ b/app/assets/javascripts/pages/groups/show/index.js @@ -6,7 +6,7 @@ import NewGroupChild from '~/groups/new_group_child'; import notificationsDropdown from '~/notifications_dropdown'; import NotificationsForm from '~/notifications_form'; import ProjectsList from '~/projects_list'; -import ShortcutsNavigation from '~/shortcuts_navigation'; +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import GroupTabs from './group_tabs'; document.addEventListener('DOMContentLoaded', () => { diff --git a/app/assets/javascripts/pages/projects/activity/index.js b/app/assets/javascripts/pages/projects/activity/index.js index 5543ad82428..d39ea3d10bf 100644 --- a/app/assets/javascripts/pages/projects/activity/index.js +++ b/app/assets/javascripts/pages/projects/activity/index.js @@ -1,5 +1,5 @@ import Activities from '~/activities'; -import ShortcutsNavigation from '~/shortcuts_navigation'; +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; document.addEventListener('DOMContentLoaded', () => { new Activities(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/projects/artifacts/browse/index.js b/app/assets/javascripts/pages/projects/artifacts/browse/index.js index ea7458fe9b8..26dc90a56d7 100644 --- a/app/assets/javascripts/pages/projects/artifacts/browse/index.js +++ b/app/assets/javascripts/pages/projects/artifacts/browse/index.js @@ -1,5 +1,5 @@ import BuildArtifacts from '~/build_artifacts'; -import ShortcutsNavigation from '~/shortcuts_navigation'; +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; document.addEventListener('DOMContentLoaded', () => { new ShortcutsNavigation(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/projects/artifacts/file/index.js b/app/assets/javascripts/pages/projects/artifacts/file/index.js index 8484e5e9848..249900d6cb7 100644 --- a/app/assets/javascripts/pages/projects/artifacts/file/index.js +++ b/app/assets/javascripts/pages/projects/artifacts/file/index.js @@ -1,5 +1,5 @@ import BlobViewer from '~/blob/viewer/index'; -import ShortcutsNavigation from '~/shortcuts_navigation'; +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; document.addEventListener('DOMContentLoaded', () => { new ShortcutsNavigation(); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/projects/boards/index.js b/app/assets/javascripts/pages/projects/boards/index.js index 5cfe8723204..79c3be771d0 100644 --- a/app/assets/javascripts/pages/projects/boards/index.js +++ b/app/assets/javascripts/pages/projects/boards/index.js @@ -1,5 +1,5 @@ import UsersSelect from '~/users_select'; -import ShortcutsNavigation from '~/shortcuts_navigation'; +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import initBoards from '~/boards'; document.addEventListener('DOMContentLoaded', () => { diff --git a/app/assets/javascripts/pages/projects/commit/show/index.js b/app/assets/javascripts/pages/projects/commit/show/index.js index 2e23cce11ce..f477424811d 100644 --- a/app/assets/javascripts/pages/projects/commit/show/index.js +++ b/app/assets/javascripts/pages/projects/commit/show/index.js @@ -3,7 +3,7 @@ import $ from 'jquery'; import Diff from '~/diff'; import ZenMode from '~/zen_mode'; -import ShortcutsNavigation from '~/shortcuts_navigation'; +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import MiniPipelineGraph from '~/mini_pipeline_graph_dropdown'; import initNotes from '~/init_notes'; import initChangesDropdown from '~/init_changes_dropdown'; diff --git a/app/assets/javascripts/pages/projects/commits/show/index.js b/app/assets/javascripts/pages/projects/commits/show/index.js index 3682020579b..ad671ce9351 100644 --- a/app/assets/javascripts/pages/projects/commits/show/index.js +++ b/app/assets/javascripts/pages/projects/commits/show/index.js @@ -1,6 +1,6 @@ import CommitsList from '~/commits'; import GpgBadges from '~/gpg_badges'; -import ShortcutsNavigation from '~/shortcuts_navigation'; +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; document.addEventListener('DOMContentLoaded', () => { new CommitsList(document.querySelector('.js-project-commits-show').dataset.commitsLimit); // eslint-disable-line no-new diff --git a/app/assets/javascripts/pages/projects/find_file/show/index.js b/app/assets/javascripts/pages/projects/find_file/show/index.js index 24630c2aa05..388d7d7bdda 100644 --- a/app/assets/javascripts/pages/projects/find_file/show/index.js +++ b/app/assets/javascripts/pages/projects/find_file/show/index.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import ProjectFindFile from '~/project_find_file'; -import ShortcutsFindFile from '~/shortcuts_find_file'; +import ShortcutsFindFile from '~/behaviors/shortcuts/shortcuts_find_file'; document.addEventListener('DOMContentLoaded', () => { const findElement = document.querySelector('.js-file-finder'); diff --git a/app/assets/javascripts/pages/projects/index.js b/app/assets/javascripts/pages/projects/index.js index 9c074b74c3b..5659e13981a 100644 --- a/app/assets/javascripts/pages/projects/index.js +++ b/app/assets/javascripts/pages/projects/index.js @@ -1,7 +1,7 @@ import initDismissableCallout from '~/dismissable_callout'; import initGkeDropdowns from '~/projects/gke_cluster_dropdowns'; import Project from './project'; -import ShortcutsNavigation from '../../shortcuts_navigation'; +import ShortcutsNavigation from '../../behaviors/shortcuts/shortcuts_navigation'; document.addEventListener('DOMContentLoaded', () => { const { page } = document.body.dataset; diff --git a/app/assets/javascripts/pages/projects/init_blob.js b/app/assets/javascripts/pages/projects/init_blob.js index 56ab3fcdfcb..bc08ccf3584 100644 --- a/app/assets/javascripts/pages/projects/init_blob.js +++ b/app/assets/javascripts/pages/projects/init_blob.js @@ -1,7 +1,7 @@ import LineHighlighter from '~/line_highlighter'; import BlobLinePermalinkUpdater from '~/blob/blob_line_permalink_updater'; -import ShortcutsNavigation from '~/shortcuts_navigation'; -import ShortcutsBlob from '~/shortcuts_blob'; +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; +import ShortcutsBlob from '~/behaviors/shortcuts/shortcuts_blob'; import BlobForkSuggestion from '~/blob/blob_fork_suggestion'; import initBlobBundle from '~/blob_edit/blob_bundle'; diff --git a/app/assets/javascripts/pages/projects/issues/form.js b/app/assets/javascripts/pages/projects/issues/form.js index b2b8e5d2300..197bfa8a394 100644 --- a/app/assets/javascripts/pages/projects/issues/form.js +++ b/app/assets/javascripts/pages/projects/issues/form.js @@ -5,7 +5,7 @@ import GLForm from '~/gl_form'; import IssuableForm from '~/issuable_form'; import LabelsSelect from '~/labels_select'; import MilestoneSelect from '~/milestone_select'; -import ShortcutsNavigation from '~/shortcuts_navigation'; +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import IssuableTemplateSelectors from '~/templates/issuable_template_selectors'; export default () => { diff --git a/app/assets/javascripts/pages/projects/issues/index/index.js b/app/assets/javascripts/pages/projects/issues/index/index.js index 70fdb0ef40d..58038327fe7 100644 --- a/app/assets/javascripts/pages/projects/issues/index/index.js +++ b/app/assets/javascripts/pages/projects/issues/index/index.js @@ -1,7 +1,7 @@ /* eslint-disable no-new */ import IssuableIndex from '~/issuable_index'; -import ShortcutsNavigation from '~/shortcuts_navigation'; +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import UsersSelect from '~/users_select'; import initFilteredSearch from '~/pages/search/init_filtered_search'; import { FILTERED_SEARCH } from '~/pages/constants'; diff --git a/app/assets/javascripts/pages/projects/issues/show.js b/app/assets/javascripts/pages/projects/issues/show.js index 500fbd27340..74b3a515e84 100644 --- a/app/assets/javascripts/pages/projects/issues/show.js +++ b/app/assets/javascripts/pages/projects/issues/show.js @@ -1,6 +1,6 @@ import initIssuableSidebar from '~/init_issuable_sidebar'; import Issue from '~/issue'; -import ShortcutsIssuable from '~/shortcuts_issuable'; +import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable'; import ZenMode from '~/zen_mode'; import '~/notes/index'; import '~/issue_show/index'; diff --git a/app/assets/javascripts/pages/projects/merge_requests/index/index.js b/app/assets/javascripts/pages/projects/merge_requests/index/index.js index a7aa616319f..97634c0c11e 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/index/index.js +++ b/app/assets/javascripts/pages/projects/merge_requests/index/index.js @@ -1,5 +1,5 @@ import IssuableIndex from '~/issuable_index'; -import ShortcutsNavigation from '~/shortcuts_navigation'; +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import UsersSelect from '~/users_select'; import initFilteredSearch from '~/pages/search/init_filtered_search'; import { FILTERED_SEARCH } from '~/pages/constants'; diff --git a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js index 3a3c21f2202..e3971618da5 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js +++ b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import Diff from '~/diff'; -import ShortcutsNavigation from '~/shortcuts_navigation'; +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import GLForm from '~/gl_form'; import IssuableForm from '~/issuable_form'; import LabelsSelect from '~/labels_select'; diff --git a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js index 26ead75cec4..7bfb83a2204 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js +++ b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js @@ -1,6 +1,6 @@ import ZenMode from '~/zen_mode'; import initIssuableSidebar from '~/init_issuable_sidebar'; -import ShortcutsIssuable from '~/shortcuts_issuable'; +import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable'; import { handleLocationHash } from '~/lib/utils/common_utils'; import howToMerge from '~/how_to_merge'; import initPipelines from '~/commit/pipelines/pipelines_bundle'; diff --git a/app/assets/javascripts/pages/projects/network/show/index.js b/app/assets/javascripts/pages/projects/network/show/index.js index a0b14fed10f..9f05f63b742 100644 --- a/app/assets/javascripts/pages/projects/network/show/index.js +++ b/app/assets/javascripts/pages/projects/network/show/index.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import ShortcutsNetwork from '../../../../shortcuts_network'; +import ShortcutsNetwork from '~/behaviors/shortcuts/shortcuts_network'; import Network from '../network'; document.addEventListener('DOMContentLoaded', () => { diff --git a/app/assets/javascripts/pages/projects/show/index.js b/app/assets/javascripts/pages/projects/show/index.js index 0507f67843f..7302c1ab202 100644 --- a/app/assets/javascripts/pages/projects/show/index.js +++ b/app/assets/javascripts/pages/projects/show/index.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import initBlob from '~/blob_edit/blob_bundle'; -import ShortcutsNavigation from '~/shortcuts_navigation'; +import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import NotificationsForm from '~/notifications_form'; import UserCallout from '~/user_callout'; import TreeView from '~/tree'; diff --git a/app/assets/javascripts/pages/projects/tree/show/index.js b/app/assets/javascripts/pages/projects/tree/show/index.js index 33d69d891d8..400aed35e32 100644 --- a/app/assets/javascripts/pages/projects/tree/show/index.js +++ b/app/assets/javascripts/pages/projects/tree/show/index.js @@ -4,7 +4,7 @@ import initBlob from '~/blob_edit/blob_bundle'; import commitPipelineStatus from '~/projects/tree/components/commit_pipeline_status_component.vue'; import GpgBadges from '~/gpg_badges'; import TreeView from '../../../../tree'; -import ShortcutsNavigation from '../../../../shortcuts_navigation'; +import ShortcutsNavigation from '../../../../behaviors/shortcuts/shortcuts_navigation'; import BlobViewer from '../../../../blob/viewer'; import NewCommitForm from '../../../../new_commit_form'; import { ajaxGet } from '../../../../lib/utils/common_utils'; diff --git a/app/assets/javascripts/pages/projects/wikis/index.js b/app/assets/javascripts/pages/projects/wikis/index.js index b0a323a71cd..c2629090f01 100644 --- a/app/assets/javascripts/pages/projects/wikis/index.js +++ b/app/assets/javascripts/pages/projects/wikis/index.js @@ -2,8 +2,8 @@ import $ from 'jquery'; import Vue from 'vue'; import Translate from '~/vue_shared/translate'; import csrf from '~/lib/utils/csrf'; +import ShortcutsWiki from '~/behaviors/shortcuts/shortcuts_wiki'; import Wikis from './wikis'; -import ShortcutsWiki from '../../../shortcuts_wiki'; import ZenMode from '../../../zen_mode'; import GLForm from '../../../gl_form'; import deleteWikiModal from './components/delete_wiki_modal.vue'; diff --git a/app/assets/javascripts/shortcuts.js b/app/assets/javascripts/shortcuts.js deleted file mode 100644 index bc1ae5c4976..00000000000 --- a/app/assets/javascripts/shortcuts.js +++ /dev/null @@ -1,124 +0,0 @@ -import $ from 'jquery'; -import Cookies from 'js-cookie'; -import Mousetrap from 'mousetrap'; -import axios from './lib/utils/axios_utils'; -import { refreshCurrentPage, visitUrl } from './lib/utils/url_utility'; -import findAndFollowLink from './lib/utils/navigation_utility'; - -const defaultStopCallback = Mousetrap.stopCallback; -Mousetrap.stopCallback = (e, element, combo) => { - if (['ctrl+shift+p', 'command+shift+p'].indexOf(combo) !== -1) { - return false; - } - - return defaultStopCallback(e, element, combo); -}; - -export default class Shortcuts { - constructor() { - this.onToggleHelp = this.onToggleHelp.bind(this); - this.enabledHelp = []; - - Mousetrap.bind('?', this.onToggleHelp); - Mousetrap.bind('s', Shortcuts.focusSearch); - Mousetrap.bind('f', this.focusFilter.bind(this)); - Mousetrap.bind('p b', Shortcuts.onTogglePerfBar); - - const findFileURL = document.body.dataset.findFile; - - Mousetrap.bind('shift+t', () => findAndFollowLink('.shortcuts-todos')); - Mousetrap.bind('shift+a', () => findAndFollowLink('.dashboard-shortcuts-activity')); - Mousetrap.bind('shift+i', () => findAndFollowLink('.dashboard-shortcuts-issues')); - Mousetrap.bind('shift+m', () => findAndFollowLink('.dashboard-shortcuts-merge_requests')); - Mousetrap.bind('shift+p', () => findAndFollowLink('.dashboard-shortcuts-projects')); - Mousetrap.bind('shift+g', () => findAndFollowLink('.dashboard-shortcuts-groups')); - Mousetrap.bind('shift+l', () => findAndFollowLink('.dashboard-shortcuts-milestones')); - Mousetrap.bind('shift+s', () => findAndFollowLink('.dashboard-shortcuts-snippets')); - - Mousetrap.bind(['ctrl+shift+p', 'command+shift+p'], Shortcuts.toggleMarkdownPreview); - - if (typeof findFileURL !== 'undefined' && findFileURL !== null) { - Mousetrap.bind('t', () => { - visitUrl(findFileURL); - }); - } - - $(document).on('click.more_help', '.js-more-help-button', function clickMoreHelp(e) { - $(this).remove(); - $('.hidden-shortcut').show(); - e.preventDefault(); - }); - } - - onToggleHelp(e) { - if (e.preventDefault) { - e.preventDefault(); - } - - Shortcuts.toggleHelp(this.enabledHelp); - } - - static onTogglePerfBar(e) { - e.preventDefault(); - const performanceBarCookieName = 'perf_bar_enabled'; - if (Cookies.get(performanceBarCookieName) === 'true') { - Cookies.set(performanceBarCookieName, 'false', { path: '/' }); - } else { - Cookies.set(performanceBarCookieName, 'true', { path: '/' }); - } - refreshCurrentPage(); - } - - static toggleMarkdownPreview(e) { - // Check if short-cut was triggered while in Write Mode - const $target = $(e.target); - const $form = $target.closest('form'); - - if ($target.hasClass('js-note-text')) { - $('.js-md-preview-button', $form).focus(); - } - $(document).triggerHandler('markdown-preview:toggle', [e]); - } - - static toggleHelp(location) { - const $modal = $('#modal-shortcuts'); - - if ($modal.length) { - $modal.modal('toggle'); - return null; - } - - return axios.get(gon.shortcuts_path, { - responseType: 'text', - }).then(({ data }) => { - $.globalEval(data); - - if (location && location.length > 0) { - const results = []; - for (let i = 0, len = location.length; i < len; i += 1) { - results.push($(location[i]).show()); - } - return results; - } - - $('.hidden-shortcut').show(); - return $('.js-more-help-button').remove(); - }); - } - - focusFilter(e) { - if (!this.filterInput) { - this.filterInput = $('input[type=search]', '.nav-controls'); - } - this.filterInput.focus(); - e.preventDefault(); - } - - static focusSearch(e) { - $('#search').focus(); - - if (e.preventDefault) { - e.preventDefault(); - } - } -} diff --git a/app/assets/javascripts/shortcuts_blob.js b/app/assets/javascripts/shortcuts_blob.js deleted file mode 100644 index 908b9cab93d..00000000000 --- a/app/assets/javascripts/shortcuts_blob.js +++ /dev/null @@ -1,26 +0,0 @@ -import Mousetrap from 'mousetrap'; -import { getLocationHash, visitUrl } from './lib/utils/url_utility'; -import Shortcuts from './shortcuts'; - -const defaults = { - skipResetBindings: false, - fileBlobPermalinkUrl: null, -}; - -export default class ShortcutsBlob extends Shortcuts { - constructor(opts) { - const options = Object.assign({}, defaults, opts); - super(options.skipResetBindings); - this.options = options; - - Mousetrap.bind('y', this.moveToFilePermalink.bind(this)); - } - - moveToFilePermalink() { - if (this.options.fileBlobPermalinkUrl) { - const hash = getLocationHash(); - const hashUrlString = hash ? `#${hash}` : ''; - visitUrl(`${this.options.fileBlobPermalinkUrl}${hashUrlString}`); - } - } -} diff --git a/app/assets/javascripts/shortcuts_find_file.js b/app/assets/javascripts/shortcuts_find_file.js deleted file mode 100644 index 8658081c6c2..00000000000 --- a/app/assets/javascripts/shortcuts_find_file.js +++ /dev/null @@ -1,29 +0,0 @@ -import Mousetrap from 'mousetrap'; -import ShortcutsNavigation from './shortcuts_navigation'; - -export default class ShortcutsFindFile extends ShortcutsNavigation { - constructor(projectFindFile) { - super(); - - const oldStopCallback = Mousetrap.stopCallback; - this.projectFindFile = projectFindFile; - - Mousetrap.stopCallback = (e, element, combo) => { - if ( - element === this.projectFindFile.inputElement[0] && - (combo === 'up' || combo === 'down' || combo === 'esc' || combo === 'enter') - ) { - // when press up/down key in textbox, cursor prevent to move to home/end - e.preventDefault(); - return false; - } - - return oldStopCallback(e, element, combo); - }; - - Mousetrap.bind('up', this.projectFindFile.selectRowUp); - Mousetrap.bind('down', this.projectFindFile.selectRowDown); - Mousetrap.bind('esc', this.projectFindFile.goToTree); - Mousetrap.bind('enter', this.projectFindFile.goToBlob); - } -} diff --git a/app/assets/javascripts/shortcuts_issuable.js b/app/assets/javascripts/shortcuts_issuable.js deleted file mode 100644 index e9451be31fd..00000000000 --- a/app/assets/javascripts/shortcuts_issuable.js +++ /dev/null @@ -1,77 +0,0 @@ -import $ from 'jquery'; -import Mousetrap from 'mousetrap'; -import _ from 'underscore'; -import Sidebar from './right_sidebar'; -import Shortcuts from './shortcuts'; -import { CopyAsGFM } from './behaviors/markdown/copy_as_gfm'; - -export default class ShortcutsIssuable extends Shortcuts { - constructor(isMergeRequest) { - super(); - - Mousetrap.bind('a', () => ShortcutsIssuable.openSidebarDropdown('assignee')); - Mousetrap.bind('m', () => ShortcutsIssuable.openSidebarDropdown('milestone')); - Mousetrap.bind('l', () => ShortcutsIssuable.openSidebarDropdown('labels')); - Mousetrap.bind('r', ShortcutsIssuable.replyWithSelectedText); - Mousetrap.bind('e', ShortcutsIssuable.editIssue); - - if (isMergeRequest) { - this.enabledHelp.push('.hidden-shortcut.merge_requests'); - } else { - this.enabledHelp.push('.hidden-shortcut.issues'); - } - } - - static replyWithSelectedText() { - const $replyField = $('.js-main-target-form .js-vue-comment-form'); - const documentFragment = window.gl.utils.getSelectedFragment(); - - if (!$replyField.length) { - return false; - } - - if (!documentFragment) { - $replyField.focus(); - return false; - } - - const el = CopyAsGFM.transformGFMSelection(documentFragment.cloneNode(true)); - const selected = CopyAsGFM.nodeToGFM(el); - - if (selected.trim() === '') { - return false; - } - - const quote = _.map(selected.split('\n'), val => `${`> ${val}`.trim()}\n`); - - // If replyField already has some content, add a newline before our quote - const separator = ($replyField.val().trim() !== '' && '\n\n') || ''; - $replyField - .val((a, current) => `${current}${separator}${quote.join('')}\n`) - .trigger('input') - .trigger('change'); - - // Trigger autosize - const event = document.createEvent('Event'); - event.initEvent('autosize:update', true, false); - $replyField.get(0).dispatchEvent(event); - - // Focus the input field - $replyField.focus(); - - return false; - } - - static editIssue() { - // Need to click the element as on issues, editing is inline - // on merge request, editing is on a different page - document.querySelector('.js-issuable-edit').click(); - - return false; - } - - static openSidebarDropdown(name) { - Sidebar.instance.openDropdown(name); - return false; - } -} diff --git a/app/assets/javascripts/shortcuts_navigation.js b/app/assets/javascripts/shortcuts_navigation.js deleted file mode 100644 index e496fadaaa3..00000000000 --- a/app/assets/javascripts/shortcuts_navigation.js +++ /dev/null @@ -1,28 +0,0 @@ -import Mousetrap from 'mousetrap'; -import findAndFollowLink from './lib/utils/navigation_utility'; -import Shortcuts from './shortcuts'; - -export default class ShortcutsNavigation extends Shortcuts { - constructor() { - super(); - - Mousetrap.bind('g p', () => findAndFollowLink('.shortcuts-project')); - Mousetrap.bind('g v', () => findAndFollowLink('.shortcuts-project-activity')); - Mousetrap.bind('g f', () => findAndFollowLink('.shortcuts-tree')); - Mousetrap.bind('g c', () => findAndFollowLink('.shortcuts-commits')); - Mousetrap.bind('g j', () => findAndFollowLink('.shortcuts-builds')); - Mousetrap.bind('g n', () => findAndFollowLink('.shortcuts-network')); - Mousetrap.bind('g d', () => findAndFollowLink('.shortcuts-repository-charts')); - Mousetrap.bind('g i', () => findAndFollowLink('.shortcuts-issues')); - Mousetrap.bind('g b', () => findAndFollowLink('.shortcuts-issue-boards')); - Mousetrap.bind('g m', () => findAndFollowLink('.shortcuts-merge_requests')); - Mousetrap.bind('g w', () => findAndFollowLink('.shortcuts-wiki')); - Mousetrap.bind('g s', () => findAndFollowLink('.shortcuts-snippets')); - Mousetrap.bind('g k', () => findAndFollowLink('.shortcuts-kubernetes')); - Mousetrap.bind('g e', () => findAndFollowLink('.shortcuts-environments')); - Mousetrap.bind('g l', () => findAndFollowLink('.shortcuts-metrics')); - Mousetrap.bind('i', () => findAndFollowLink('.shortcuts-new-issue')); - - this.enabledHelp.push('.hidden-shortcut.project'); - } -} diff --git a/app/assets/javascripts/shortcuts_network.js b/app/assets/javascripts/shortcuts_network.js deleted file mode 100644 index a88c280fa3b..00000000000 --- a/app/assets/javascripts/shortcuts_network.js +++ /dev/null @@ -1,17 +0,0 @@ -import Mousetrap from 'mousetrap'; -import ShortcutsNavigation from './shortcuts_navigation'; - -export default class ShortcutsNetwork extends ShortcutsNavigation { - constructor(graph) { - super(); - - Mousetrap.bind(['left', 'h'], graph.scrollLeft); - Mousetrap.bind(['right', 'l'], graph.scrollRight); - Mousetrap.bind(['up', 'k'], graph.scrollUp); - Mousetrap.bind(['down', 'j'], graph.scrollDown); - Mousetrap.bind(['shift+up', 'shift+k'], graph.scrollTop); - Mousetrap.bind(['shift+down', 'shift+j'], graph.scrollBottom); - - this.enabledHelp.push('.hidden-shortcut.network'); - } -} diff --git a/app/assets/javascripts/shortcuts_wiki.js b/app/assets/javascripts/shortcuts_wiki.js deleted file mode 100644 index d30abfdd807..00000000000 --- a/app/assets/javascripts/shortcuts_wiki.js +++ /dev/null @@ -1,14 +0,0 @@ -import Mousetrap from 'mousetrap'; -import ShortcutsNavigation from './shortcuts_navigation'; -import findAndFollowLink from './lib/utils/navigation_utility'; - -export default class ShortcutsWiki extends ShortcutsNavigation { - constructor() { - super(); - Mousetrap.bind('e', ShortcutsWiki.editWiki); - } - - static editWiki() { - findAndFollowLink('.js-wiki-edit'); - } -} -- cgit v1.2.1