Add back button to RHS threads from pinned posts (#6306)
Этот коммит содержится в:
коммит произвёл
Corey Hulen
родитель
6a6c5365d3
Коммит
ec5f40a423
@@ -6,7 +6,7 @@ import Constants from 'utils/constants.jsx';
|
||||
import {Tooltip, OverlayTrigger} from 'react-bootstrap';
|
||||
|
||||
import * as GlobalActions from 'actions/global_actions.jsx';
|
||||
import {getFlaggedPosts} from 'actions/post_actions.jsx';
|
||||
import {getFlaggedPosts, getPinnedPosts} from 'actions/post_actions.jsx';
|
||||
|
||||
import {FormattedMessage} from 'react-intl';
|
||||
|
||||
@@ -24,15 +24,18 @@ export default class RhsHeaderPost extends React.Component {
|
||||
|
||||
this.state = {};
|
||||
}
|
||||
|
||||
handleClose(e) {
|
||||
e.preventDefault();
|
||||
GlobalActions.emitCloseRightHandSide();
|
||||
this.props.shrink();
|
||||
}
|
||||
|
||||
toggleSize(e) {
|
||||
e.preventDefault();
|
||||
this.props.toggleSize();
|
||||
}
|
||||
|
||||
handleBack(e) {
|
||||
e.preventDefault();
|
||||
|
||||
@@ -50,8 +53,11 @@ export default class RhsHeaderPost extends React.Component {
|
||||
});
|
||||
} else if (this.props.fromFlaggedPosts) {
|
||||
getFlaggedPosts();
|
||||
} else if (this.props.fromPinnedPosts) {
|
||||
getPinnedPosts();
|
||||
}
|
||||
}
|
||||
|
||||
render() {
|
||||
let back;
|
||||
const closeSidebarTooltip = (
|
||||
@@ -91,6 +97,15 @@ export default class RhsHeaderPost extends React.Component {
|
||||
/>
|
||||
</Tooltip>
|
||||
);
|
||||
} else if (this.props.fromPinnedPosts) {
|
||||
backToResultsTooltip = (
|
||||
<Tooltip id='backToResultsTooltip'>
|
||||
<FormattedMessage
|
||||
id='rhs_header.backToPinnedTooltip'
|
||||
defaultMessage='Back to Pinned Posts'
|
||||
/>
|
||||
</Tooltip>
|
||||
);
|
||||
}
|
||||
|
||||
const expandSidebarTooltip = (
|
||||
@@ -111,7 +126,7 @@ export default class RhsHeaderPost extends React.Component {
|
||||
</Tooltip>
|
||||
);
|
||||
|
||||
if (this.props.fromSearch || this.props.fromFlaggedPosts || this.props.isWebrtc) {
|
||||
if (this.props.fromSearch || this.props.fromFlaggedPosts || this.props.isWebrtc || this.props.fromPinnedPosts) {
|
||||
back = (
|
||||
<a
|
||||
href='#'
|
||||
@@ -190,6 +205,7 @@ RhsHeaderPost.propTypes = {
|
||||
isWebrtc: React.PropTypes.bool,
|
||||
fromSearch: React.PropTypes.string,
|
||||
fromFlaggedPosts: React.PropTypes.bool,
|
||||
fromPinnedPosts: React.PropTypes.bool,
|
||||
toggleSize: React.PropTypes.func,
|
||||
shrink: React.PropTypes.func
|
||||
};
|
||||
|
||||
Ссылка в новой задаче
Block a user