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

Closing 'RHS' on mobile when jump link is clicked (#2825)

Browse Source
This commit is contained in:
Christopher Speller
2016-05-02 08:08:05 -04:00
parent c63e027aec
commit 29b91301a6
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
webapp/components/search_results_item.jsx
View File

@@ -6,13 +6,15 @@ import UserProfile from './user_profile.jsx';
import UserStore from 'stores/user_store.jsx';
import * as GlobalActions from 'action_creators/global_actions.jsx';
import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
import * as TextFormatting from 'utils/text_formatting.jsx';
import * as Utils from 'utils/utils.jsx';
import Constants from 'utils/constants.jsx';
const ActionTypes = Constants.ActionTypes;
import {FormattedMessage, FormattedDate} from 'react-intl';
import React from 'react';
import {Link} from 'react-router';
import {browserHistory} from 'react-router';
export default class SearchResultsItem extends React.Component {
constructor(props) {
@@ -105,15 +107,37 @@ export default class SearchResultsItem extends React.Component {
</time>
</li>
<li>
<Link
to={'/' + window.location.pathname.split('/')[1] + '/pl/' + post.id}
<a
onClick={
() => {
if (Utils.isMobile()) {
AppDispatcher.handleServerAction({
type: ActionTypes.RECEIVED_SEARCH,
results: null
});
AppDispatcher.handleServerAction({
type: ActionTypes.RECEIVED_SEARCH_TERM,
term: null,
do_search: false,
is_mention_search: false
});
AppDispatcher.handleServerAction({
type: ActionTypes.RECEIVED_POST_SELECTED,
postId: null
});
}
browserHistory.push('/' + window.location.pathname.split('/')[1] + '/pl/' + post.id);
}
}
className='search-item__jump'
>
<FormattedMessage
id='search_item.jump'
defaultMessage='Jump'
/>
</Link>
</a>
</li>
<li>
<a

2
webapp/utils/utils.jsx
View File

@@ -937,7 +937,7 @@ export function isValidUsername(name) {
}
export function isMobile() {
return screen.width <= 768;
return window.innerWidth <= 768;
}
export function isComment(post) {