imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3

Browse source 
 Conflicts:
	src/components/structures/LoggedInView.js
This commit is contained in:
Michael Telatynski 2020-03-20 16:10:27 +00:00
commit a56e474203
8 changed files with 161 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/structures/LoggedInView.js
View file

@ -380,12 +380,24 @@ const LoggedInView = createReactClass({
break;
case Key.SLASH:
if (ev.ctrlKey && !ev.shiftKey && !ev.altKey && !ev.metaKey) {
if (ctrlCmdOnly) {
KeyboardShortcuts.toggleDialog();
handled = true;
}
break;
case Key.ARROW_UP:
case Key.ARROW_DOWN:
if (ev.altKey && !ev.ctrlKey && !ev.metaKey) {
dis.dispatch({
action: 'view_room_delta',
delta: ev.key === Key.ARROW_UP ? -1 : 1,
unread: ev.shiftKey,
});
handled = true;
}
break;
case Key.PERIOD:
if (ctrlCmdOnly && (this.props.page_type === "room_view" || this.props.page_type === "group_view")) {
dis.dispatch({