IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[PLT-6697] Added CTRL/CMD+SHIFT+K shortcut to open 'more direct messages' dialog (#6534)

Browse Source 
* add keypress shortcut to open 'more direct messages' dialog

* removed duplicate e.preventDefault()

* add text description to /shortcuts output
This commit is contained in:
Saturnino Abril
2017-06-05 20:46:31 +08:00
committed by Harrison Healey
parent fd6f6a55ce
commit 0d6dd52be6
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/command_shortcuts.go
View File

@@ -47,6 +47,7 @@ func (me *ShortcutsProvider) DoCommand(args *model.CommandArgs, message string)
"api.command_shortcuts.nav.unread_next",
"api.command_shortcuts.nav.switcher",
"api.command_shortcuts.nav.switcher_team",
"api.command_shortcuts.nav.direct_messages_menu",
"api.command_shortcuts.nav.settings",
"api.command_shortcuts.nav.recent_mentions",
// Files shortcuts

4
i18n/en.json
View File

@@ -799,6 +799,10 @@
"id": "api.command_shortcuts.nav.switcher_team",
"translation": "{{.CmdOrCtrl}}+ALT+K: Open a quick team switcher dialog\n"
},
{
"id": "api.command_shortcuts.nav.direct_messages_menu",
"translation": "{{.CmdOrCtrl}}+SHIFT+K: Open direct messages menu\n"
},
{
"id": "api.command_shortcuts.nav.unread_next",
"translation": "ALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\n"

2
webapp/components/navbar.jsx
View File

@@ -220,7 +220,7 @@ export default class Navbar extends React.Component {
}
handleQuickSwitchKeyPress(e) {
if (Utils.cmdOrCtrlPressed(e, true) && e.keyCode === Constants.KeyCodes.K) {
if (Utils.cmdOrCtrlPressed(e, true) && !e.shiftKey && e.keyCode === Constants.KeyCodes.K) {
e.preventDefault();
if (e.altKey) {
if (getMyTeams(store.getState()).length <= 1) {

13
webapp/components/sidebar.jsx
View File

@@ -68,6 +68,7 @@ export default class Sidebar extends React.Component {
this.hideNewChannelModal = this.hideNewChannelModal.bind(this);
this.showMoreDirectChannelsModal = this.showMoreDirectChannelsModal.bind(this);
this.hideMoreDirectChannelsModal = this.hideMoreDirectChannelsModal.bind(this);
this.handleOpenMoreDirectChannelsModal = this.handleOpenMoreDirectChannelsModal.bind(this);
this.createChannelElement = this.createChannelElement.bind(this);
this.updateTitle = this.updateTitle.bind(this);
@@ -200,6 +201,11 @@ export default class Sidebar extends React.Component {
this.showMoreDirectChannelsModal(args.startingUsers);
}
handleOpenMoreDirectChannelsModal(e) {
e.preventDefault();
this.showMoreDirectChannelsModal();
}
onChange() {
if (this.state.currentTeam.id !== TeamStore.getCurrentId()) {
ChannelStore.clear();
@@ -301,6 +307,8 @@ export default class Sidebar extends React.Component {
ChannelActions.goToChannel(nextChannel);
this.updateScrollbarOnChannelChange(nextChannel);
this.isSwitchingChannel = false;
} else if (Utils.cmdOrCtrlPressed(e) && e.shiftKey && e.keyCode === Constants.KeyCodes.K) {
this.handleOpenMoreDirectChannelsModal(e);
}
}
@@ -681,10 +689,7 @@ export default class Sidebar extends React.Component {
<li key='more'>
<a
href='#'
onClick={(e) => {
e.preventDefault();
this.showMoreDirectChannelsModal();
}}
onClick={this.handleOpenMoreDirectChannelsModal}
>
<FormattedMessage
id='sidebar.moreElips'