diff --git a/app/soapbox/features/ui/components/hotkeys_modal.js b/app/soapbox/features/ui/components/hotkeys_modal.js
index 005e19898..319e2e0e5 100644
--- a/app/soapbox/features/ui/components/hotkeys_modal.js
+++ b/app/soapbox/features/ui/components/hotkeys_modal.js
@@ -65,10 +65,6 @@ class HotkeysModal extends ImmutablePureComponent {
h |
|
-
- up, k |
- |
-
@@ -79,12 +75,12 @@ class HotkeysModal extends ImmutablePureComponent {
- down, j |
- |
+ up, k |
+ |
- 1 - 9 |
- |
+ down, j |
+ |
n |
@@ -110,14 +106,6 @@ class HotkeysModal extends ImmutablePureComponent {
g + h |
|
-
- g + n |
- |
-
-
- g + d |
- |
-
@@ -128,8 +116,8 @@ class HotkeysModal extends ImmutablePureComponent {
- g + s |
- |
+ g + n |
+ |
g + f |
diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js
index f9173929e..92a9623a6 100644
--- a/app/soapbox/features/ui/index.js
+++ b/app/soapbox/features/ui/index.js
@@ -126,7 +126,6 @@ const keyMap = {
new: 'n',
search: 's',
forceNew: 'option+n',
- focusColumn: ['1', '2', '3', '4', '5', '6', '7', '8', '9'],
reply: 'r',
favourite: 'f',
boost: 'b',
@@ -138,7 +137,6 @@ const keyMap = {
back: 'backspace',
goToHome: 'g h',
goToNotifications: 'g n',
- goToStart: 'g s',
goToFavourites: 'g f',
goToPinned: 'g p',
goToProfile: 'g u',
@@ -488,24 +486,6 @@ class UI extends React.PureComponent {
this.props.dispatch(resetCompose());
}
- handleHotkeyFocusColumn = e => {
- const index = (e.key * 1) + 1; // First child is drawer, skip that
- const column = this.node.querySelector(`.column:nth-child(${index})`);
- if (!column) return;
- const container = column.querySelector('.scrollable');
-
- if (container) {
- const status = container.querySelector('.focusable');
-
- if (status) {
- if (container.scrollTop > status.offsetTop) {
- status.scrollIntoView(true);
- }
- status.focus();
- }
- }
- }
-
handleHotkeyBack = () => {
if (window.history && window.history.length === 1) {
this.context.router.history.push('/');
@@ -536,29 +516,25 @@ class UI extends React.PureComponent {
this.context.router.history.push('/notifications');
}
- handleHotkeyGoToStart = () => {
- this.context.router.history.push('/getting-started');
- }
-
handleHotkeyGoToFavourites = () => {
const { account } = this.props;
if (!account) return;
- this.context.router.history.push(`/${account.get('username')}/favorites`);
+ this.context.router.history.push(`/@${account.get('username')}/favorites`);
}
handleHotkeyGoToPinned = () => {
const { account } = this.props;
if (!account) return;
- this.context.router.history.push(`/${account.get('username')}/pins`);
+ this.context.router.history.push(`/@${account.get('username')}/pins`);
}
handleHotkeyGoToProfile = () => {
const { account } = this.props;
if (!account) return;
- this.context.router.history.push(`/${account.get('username')}`);
+ this.context.router.history.push(`/@${account.get('username')}`);
}
handleHotkeyGoToBlocked = () => {
@@ -599,11 +575,9 @@ class UI extends React.PureComponent {
new: this.handleHotkeyNew,
search: this.handleHotkeySearch,
forceNew: this.handleHotkeyForceNew,
- focusColumn: this.handleHotkeyFocusColumn,
back: this.handleHotkeyBack,
goToHome: this.handleHotkeyGoToHome,
goToNotifications: this.handleHotkeyGoToNotifications,
- goToStart: this.handleHotkeyGoToStart,
goToFavourites: this.handleHotkeyGoToFavourites,
goToPinned: this.handleHotkeyGoToPinned,
goToProfile: this.handleHotkeyGoToProfile,