toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support MinimumHashtagLength setting (#2583)

Browse source 
* Support MinimumHashtagLength setting

* Set default value if missing
This commit is contained in:
Yusuke Nemoto 2019-03-23 02:06:02 +09:00 committed by Elias Nahum
parent a52bc4ca2e
commit d852e0991f
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/components/markdown/index.js
View file

@ -3,16 +3,19 @@
import {connect} from 'react-redux';
import {getAutolinkedUrlSchemes} from 'mattermost-redux/selectors/entities/general';
import {getAutolinkedUrlSchemes, getConfig} from 'mattermost-redux/selectors/entities/general';
import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
import {getCurrentUserMentionKeys} from 'mattermost-redux/selectors/entities/users';
import Markdown from './markdown';
function mapStateToProps(state) {
const {MinimumHashtagLength} = getConfig(state);
return {
autolinkedUrlSchemes: getAutolinkedUrlSchemes(state),
mentionKeys: getCurrentUserMentionKeys(state),
minimumHashtagLength: MinimumHashtagLength ? parseInt(MinimumHashtagLength, 10) : 3,
theme: getTheme(state),
};
}

2
app/components/markdown/markdown.js
View file

@ -48,6 +48,7 @@ export default class Markdown extends PureComponent {
isReplyPost: PropTypes.bool,
isSearchResult: PropTypes.bool,
mentionKeys: PropTypes.array.isRequired,
minimumHashtagLength: PropTypes.number.isRequired,
navigator: PropTypes.object.isRequired,
onChannelLinkPress: PropTypes.func,
onHashtagPress: PropTypes.func,
@ -80,6 +81,7 @@ export default class Markdown extends PureComponent {
createParser = () => {
return new Parser({
urlFilter: this.urlFilter,
minimumHashtagLength: this.props.minimumHashtagLength,
});
};