Commit fd515cca authored by Paul Slaughter's avatar Paul Slaughter

Merge branch 'keyboard-shortcuts-2' into 'master'

Improve Keyboard shortcut help screen

Closes #65367

See merge request gitlab-org/gitlab-ce!31642
parents 14fe47ce 4361c891
......@@ -46,7 +46,6 @@ export default class Shortcuts {
$(document).on('click.more_help', '.js-more-help-button', function clickMoreHelp(e) {
$(this).remove();
$('.hidden-shortcut').show();
e.preventDefault();
});
}
......@@ -104,7 +103,6 @@ export default class Shortcuts {
return results;
}
$('.hidden-shortcut').show();
return $('.js-more-help-button').remove();
});
}
......
......@@ -6,7 +6,7 @@ import { CopyAsGFM } from '../markdown/copy_as_gfm';
import { getSelectedFragment } from '~/lib/utils/common_utils';
export default class ShortcutsIssuable extends Shortcuts {
constructor(isMergeRequest) {
constructor() {
super();
Mousetrap.bind('a', () => ShortcutsIssuable.openSidebarDropdown('assignee'));
......@@ -14,12 +14,6 @@ export default class ShortcutsIssuable extends Shortcuts {
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() {
......
......@@ -23,7 +23,5 @@ export default class ShortcutsNavigation extends Shortcuts {
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');
}
}
......@@ -11,7 +11,5 @@ export default class ShortcutsNetwork extends ShortcutsNavigation {
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');
}
}
......@@ -6,8 +6,6 @@ export default class ShortcutsWiki extends ShortcutsNavigation {
constructor() {
super();
Mousetrap.bind('e', ShortcutsWiki.editWiki);
this.enabledHelp.push('.hidden-shortcut.wiki');
}
static editWiki() {
......
......@@ -2,6 +2,12 @@
max-width: 98%;
}
.modal-1040 {
@include media-breakpoint-up(xl) {
max-width: 1040px;
}
}
.modal-header {
background-color: $modal-body-bg;
......
This diff is collapsed.
---
title: Clean up keyboard shortcuts help modal, removing and adding as needed
merge_request: 31642
author:
type: other
This diff is collapsed.
......@@ -2035,10 +2035,10 @@ msgstr ""
msgid "Certificate (PEM)"
msgstr ""
msgid "Change Label"
msgid "Change assignee"
msgstr ""
msgid "Change assignee"
msgid "Change label"
msgstr ""
msgid "Change milestone"
......@@ -3019,6 +3019,9 @@ msgstr ""
msgid "Comment is being updated"
msgstr ""
msgid "Comment/Reply (quoting selected text)"
msgstr ""
msgid "Comments"
msgstr ""
......@@ -4189,9 +4192,15 @@ msgstr ""
msgid "Edit comment"
msgstr ""
msgid "Edit description"
msgstr ""
msgid "Edit environment"
msgstr ""
msgid "Edit epic description"
msgstr ""
msgid "Edit file"
msgstr ""
......@@ -4204,25 +4213,22 @@ msgstr ""
msgid "Edit identity for %{user_name}"
msgstr ""
msgid "Edit issue"
msgstr ""
msgid "Edit issues"
msgstr ""
msgid "Edit last comment (when focused on an empty textarea)"
msgid "Edit public deploy key"
msgstr ""
msgid "Edit merge request"
msgid "Edit stage"
msgstr ""
msgid "Edit public deploy key"
msgid "Edit wiki page"
msgstr ""
msgid "Edit stage"
msgid "Edit your most recent comment in a thread (from an empty textarea)"
msgstr ""
msgid "Edit wiki page"
msgid "Editing"
msgstr ""
msgid "Email"
......@@ -4543,6 +4549,9 @@ msgstr ""
msgid "Epic"
msgstr ""
msgid "Epics (Ultimate / Gold license only)"
msgstr ""
msgid "Error"
msgstr ""
......@@ -5100,9 +5109,6 @@ msgstr ""
msgid "Find the newly extracted <code>Takeout/Google Code Project Hosting/GoogleCodeProjectHosting.json</code> file."
msgstr ""
msgid "Finding Project File"
msgstr ""
msgid "Fingerprint"
msgstr ""
......@@ -5127,12 +5133,6 @@ msgstr ""
msgid "FlowdockService|Flowdock is a collaboration web app for technical teams."
msgstr ""
msgid "Focus Filter"
msgstr ""
msgid "Focus Search"
msgstr ""
msgid "FogBugz Email"
msgstr ""
......@@ -5376,6 +5376,9 @@ msgstr ""
msgid "Go back"
msgstr ""
msgid "Go back (while searching for files"
msgstr ""
msgid "Go back to %{startTag}Open issues%{endTag} and select some issues to add to your board."
msgstr ""
......@@ -5397,16 +5400,17 @@ msgstr ""
msgid "Go to file"
msgstr ""
msgid "Go to file permalink"
msgid "Go to file (MRs only)"
msgstr ""
msgid "Go to files"
msgid "Go to file permalink (while viewing a file)"
msgstr ""
msgid "Go to finding file"
msgid "Go to files"
msgstr ""
msgid "Go to groups"
msgid "Go to find file"
msgstr ""
msgid "Go to issue boards"
......@@ -5427,45 +5431,60 @@ msgstr ""
msgid "Go to metrics"
msgstr ""
msgid "Go to milestones"
msgstr ""
msgid "Go to network graph"
msgstr ""
msgid "Go to parent"
msgstr ""
msgid "Go to project"
msgstr ""
msgid "Go to projects"
msgid "Go to releases"
msgstr ""
msgid "Go to repository charts"
msgstr ""
msgid "Go to repository graph"
msgstr ""
msgid "Go to snippets"
msgstr ""
msgid "Go to the activity feed"
msgstr ""
msgid "Go to the milestone list"
msgstr ""
msgid "Go to the project's activity feed"
msgstr ""
msgid "Go to the project's overview page"
msgstr ""
msgid "Go to todos"
msgid "Go to wiki"
msgstr ""
msgid "Go to wiki"
msgid "Go to your To-Do list"
msgstr ""
msgid "Go to your fork"
msgstr ""
msgid "Go to your groups"
msgstr ""
msgid "Go to your issues"
msgstr ""
msgid "Go to your merge requests"
msgstr ""
msgid "Go to your projects"
msgstr ""
msgid "Go to your snippets"
msgstr ""
msgid "Google Code import"
msgstr ""
......@@ -6233,6 +6252,9 @@ msgstr ""
msgid "Issues"
msgstr ""
msgid "Issues / Merge Requests"
msgstr ""
msgid "Issues can be bugs, tasks or ideas to be discussed. Also, issues are searchable and filterable."
msgstr ""
......@@ -7254,18 +7276,6 @@ msgstr ""
msgid "Move this issue to another project."
msgstr ""
msgid "Move to next file"
msgstr ""
msgid "Move to next unresolved discussion"
msgstr ""
msgid "Move to previous file"
msgstr ""
msgid "Move to previous unresolved discussion"
msgstr ""
msgid "MoveIssue|Cannot move issue due to insufficient permissions!"
msgstr ""
......@@ -7326,9 +7336,6 @@ msgstr ""
msgid "Network"
msgstr ""
msgid "Network Graph"
msgstr ""
msgid "Never"
msgstr ""
......@@ -7451,6 +7458,12 @@ msgstr ""
msgid "Next"
msgstr ""
msgid "Next file in diff (MRs only)"
msgstr ""
msgid "Next unresolved discussion (MRs only)"
msgstr ""
msgid "Nickname"
msgstr ""
......@@ -8446,6 +8459,12 @@ msgstr ""
msgid "Previous Artifacts"
msgstr ""
msgid "Previous file in diff (MRs only)"
msgstr ""
msgid "Previous unresolved discussion (MRs only)"
msgstr ""
msgid "Prioritize"
msgstr ""
......@@ -8824,10 +8843,7 @@ msgstr ""
msgid "Project Badges"
msgstr ""
msgid "Project File"
msgstr ""
msgid "Project Files browsing"
msgid "Project Files"
msgstr ""
msgid "Project ID"
......@@ -9621,9 +9637,6 @@ msgstr ""
msgid "Replaced all labels with %{label_references} %{label_text}."
msgstr ""
msgid "Reply (quoting selected text)"
msgstr ""
msgid "Reply by email"
msgstr ""
......@@ -9672,6 +9685,9 @@ msgstr ""
msgid "Repository"
msgstr ""
msgid "Repository Graph"
msgstr ""
msgid "Repository Settings"
msgstr ""
......@@ -10499,9 +10515,6 @@ msgstr ""
msgid "Show whitespace changes"
msgstr ""
msgid "Show/hide this dialog"
msgstr ""
msgid "Showing %d event"
msgid_plural "Showing %d events"
msgstr[0] ""
......@@ -10936,6 +10949,9 @@ msgstr ""
msgid "Start date"
msgstr ""
msgid "Start search"
msgstr ""
msgid "Start the Runner!"
msgstr ""
......@@ -12274,6 +12290,9 @@ msgstr ""
msgid "Toggle the Performance Bar"
msgstr ""
msgid "Toggle this dialog"
msgstr ""
msgid "Toggle thread"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment