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-3028 Added CTRL+/ to show shortcuts (#3181)

Browse Source 
* Added CTRL / to show shortcuts

* Simplified code
This commit is contained in:
David Lu
2016-06-02 15:43:00 -07:00
committed by enahum
parent 8165f5d91f
commit 2f7540e174
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webapp/actions/channel_actions.jsx
View File

@@ -4,7 +4,12 @@
import {browserHistory} from 'react-router';
import TeamStore from 'stores/team_store.jsx';
import Client from 'utils/web_client.jsx';
export function goToChannel(channel) {
browserHistory.push(TeamStore.getCurrentTeamRelativeUrl() + '/channels/' + channel.name);
}
}
export function executeCommand(channelId, message, suggest, success, error) {
Client.executeCommand(channelId, message, suggest, success, error);
}

23
webapp/components/create_post.jsx
View File

@@ -13,6 +13,7 @@ import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
import * as GlobalActions from 'actions/global_actions.jsx';
import Client from 'utils/web_client.jsx';
import * as Utils from 'utils/utils.jsx';
import * as ChannelActions from 'actions/channel_actions.jsx';
import ChannelStore from 'stores/channel_store.jsx';
import PostStore from 'stores/post_store.jsx';
@@ -69,6 +70,7 @@ class CreatePost extends React.Component {
this.focusTextbox = this.focusTextbox.bind(this);
this.showPostDeletedModal = this.showPostDeletedModal.bind(this);
this.hidePostDeletedModal = this.hidePostDeletedModal.bind(this);
this.showShortcuts = this.showShortcuts.bind(this);
PostStore.clearDraftUploads();
@@ -129,7 +131,7 @@ class CreatePost extends React.Component {
this.setState({submitting: true, serverError: null});
this.setState({lastMessage: this.state.messageText});
if (post.message.indexOf('/') === 0) {
Client.executeCommand(
ChannelActions.executeCommand(
this.state.channelId,
post.message,
false,
@@ -311,6 +313,7 @@ class CreatePost extends React.Component {
PreferenceStore.addChangeListener(this.onPreferenceChange);
this.focusTextbox();
document.addEventListener('keydown', this.showShortcuts);
}
componentDidUpdate(prevProps, prevState) {
if (prevState.channelId !== this.state.channelId) {
@@ -320,6 +323,24 @@ class CreatePost extends React.Component {
componentWillUnmount() {
ChannelStore.removeChangeListener(this.onChange);
PreferenceStore.removeChangeListener(this.onPreferenceChange);
document.removeEventListener('keydown', this.showShortcuts);
}
showShortcuts(e) {
if ((e.ctrlKey || e.metaKey) && e.keyCode === Constants.KeyCodes.FORWARD_SLASH) {
e.preventDefault();
ChannelActions.executeCommand(
this.state.channelId,
'/shortcuts ',
false,
null,
(err) => {
this.setState({
serverError: err.message,
submitting: false
});
}
);
}
}
onChange() {
const channelId = ChannelStore.getCurrentId();