Merge pull request #3077 from matrix-org/t3chguy/change_keybind

change profile keybind to backtick from i due to italics conflict
This commit is contained in:
Michael Telatynski 2019-06-07 00:16:54 +01:00 committed by GitHub
commit 3f6b266256
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View file

@ -58,6 +58,7 @@ export const KeyCode = {
KEY_X: 88, KEY_X: 88,
KEY_Y: 89, KEY_Y: 89,
KEY_Z: 90, KEY_Z: 90,
KEY_BACKTICK: 223,
}; };
export function isOnlyCtrlOrCmdKeyEvent(ev) { export function isOnlyCtrlOrCmdKeyEvent(ev) {

View file

@ -325,10 +325,11 @@ const LoggedInView = React.createClass({
handled = true; handled = true;
} }
break; break;
case KeyCode.KEY_I: case KeyCode.KEY_BACKTICK:
// Ideally this would be CTRL+P for "Profile", but that's // Ideally this would be CTRL+P for "Profile", but that's
// taken by the print dialog. CTRL+I for "Information" // taken by the print dialog. CTRL+I for "Information"
// will have to do. // was previously chosen but conflicted with italics in
// composer, so CTRL+` it is
if (ctrlCmdOnly) { if (ctrlCmdOnly) {
dis.dispatch({ dis.dispatch({