Skip to content

Add Cmd+Shift+F as tidy code shortcut and prevent browser default behaviour #1732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Feb 24, 2021
Merged

Add Cmd+Shift+F as tidy code shortcut and prevent browser default behaviour #1732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ecefaa8
Add Cmd+Shift+F astidy code shortcut and prevent browser default beha…
vulongphan Jan 8, 2021
25f3ffa
Merge remote-tracking branch 'upstream/develop' into update/tidy-code…
vulongphan Jan 21, 2021
f801d1f
make use of variable metaKey
vulongphan Jan 21, 2021
0ef3880
Merge develop
catarak Feb 1, 2021
e53f956
use KeyboardEvent to check for shortcut to tidyCode
vulongphan Feb 3, 2021
0be0c85
use KeyboardEvent to check for shortcut to tidyCode
vulongphan Feb 3, 2021
059b171
use KeyboardEvent to check for shortcut to tidyCode
vulongphan Feb 3, 2021
afec089
use metaKey to check for Windows/MacOs
vulongphan Feb 4, 2021
7005999
update TidyCode shortcut modal
vulongphan Feb 18, 2021
e3ea72a
Merge branch 'develop' into update/tidy-code-shortcut
catarak Feb 19, 2021
38db3b0
Merge remote-tracking branch 'upstream/develop' into update/tidy-code…
vulongphan Feb 20, 2021
11f27f9
update Nav bar with the short cut for tidy code
vulongphan Feb 20, 2021
1cb1aa6
Merge branch 'update/tidy-code-shortcut' of https://github.com/vulong…
vulongphan Feb 20, 2021
3cef359
[#1711] Update Nav snapshot
catarak Feb 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion client/components/Nav.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,9 @@ class Nav extends React.PureComponent {
onBlur={this.handleBlur}
>
{this.props.t('Nav.Edit.TidyCode')}
<span className="nav__keyboard-shortcut">{'\u21E7'}+Tab</span>
<span className="nav__keyboard-shortcut">
{metaKeyName}+{'\u21E7'}+F
</span>
</button>
</li>
<li className="nav__dropdown-item">
Expand Down
2 changes: 1 addition & 1 deletion client/components/__test__/__snapshots__/Nav.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ exports[`Nav renders correctly 1`] = `
<span
class="nav__keyboard-shortcut"
>
⇧+Tab
⌃+⇧+F
</span>
</button>
</li>
Expand Down
11 changes: 8 additions & 3 deletions client/modules/IDE/components/Editor.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ const beautifyHTML = beautifyJS.html;
window.JSHINT = JSHINT;
window.CSSLint = CSSLint;
window.HTMLHint = HTMLHint;
delete CodeMirror.keyMap.sublime['Shift-Tab'];

const IS_TAB_INDENT = false;
const INDENTATION_AMOUNT = 2;
Expand Down Expand Up @@ -168,8 +167,14 @@ class Editor extends React.Component {
});

this._cm.on('keydown', (_cm, e) => {
// 9 === Tab
if (e.keyCode === 9 && e.shiftKey) {
// 70 === f
if (
((metaKey === 'Cmd' && e.metaKey) ||
(metaKey === 'Ctrl' && e.ctrlKey)) &&
e.shiftKey &&
e.keyCode === 70
) {
e.preventDefault();
this.tidyCode();
}
});
Expand Down
4 changes: 3 additions & 1 deletion client/modules/IDE/components/KeyboardShortcutModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ function KeyboardShortcutModal() {
</p>
<ul className="keyboard-shortcuts__list">
<li className="keyboard-shortcut-item">
<span className="keyboard-shortcut__command">{'\u21E7'} + Tab</span>
<span className="keyboard-shortcut__command">
{metaKeyName} + {'\u21E7'} + F
</span>
<span>{t('KeyboardShortcuts.CodeEditing.Tidy')}</span>
</li>
<li className="keyboard-shortcut-item">
Expand Down