diff options
author | enahum <nahumhbl@gmail.com> | 2016-09-16 15:35:13 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-16 15:35:13 -0300 |
commit | 781ff323db4c70e4ca476f9ef13a04e5aa063585 (patch) | |
tree | a9dae870d4e750ad87ee0624d8ea859995b0dbf7 /webapp/components/rhs_header_post.jsx | |
parent | df2d61d94175369bff5a16242f35cb6d7b62d7fb (diff) | |
download | chat-781ff323db4c70e4ca476f9ef13a04e5aa063585.tar.gz chat-781ff323db4c70e4ca476f9ef13a04e5aa063585.tar.bz2 chat-781ff323db4c70e4ca476f9ef13a04e5aa063585.zip |
Webrtc client side (#4026)
* WebRTC Server side
* WebRTC client side
* Bug fixes and improvements
* Pushing UI improvements for webrtc (#3728)
* Pushing UI improvements for webrtc
* Updating webrtc css
* PLT-3943 WebRTC P1: bug fixes and improvements
* Video resolution set to std, reduce volume of ringtone and flip video horizontally
* Fix calling a user B while WebRTC RHS is still opened
* Leave RHS opened when call ends, Fix isBusy on popover and channel_header
* Fix pre-release feature, RHS & System Console
* PLT-3945 - Updating UI for webrtc (#3908)
* PLT-3943 Webrtc p1
* Add ongoing call indicator when RHS is opened
* UI updates to to webrtc notifcation (#3959)
Diffstat (limited to 'webapp/components/rhs_header_post.jsx')
-rw-r--r-- | webapp/components/rhs_header_post.jsx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/webapp/components/rhs_header_post.jsx b/webapp/components/rhs_header_post.jsx index 978c58c85..d0d720bb5 100644 --- a/webapp/components/rhs_header_post.jsx +++ b/webapp/components/rhs_header_post.jsx @@ -36,7 +36,7 @@ export default class RhsHeaderPost extends React.Component { handleBack(e) { e.preventDefault(); - if (this.props.fromSearch) { + if (this.props.fromSearch || this.props.isWebrtc) { AppDispatcher.handleServerAction({ type: ActionTypes.RECEIVED_SEARCH_TERM, term: this.props.fromSearch, @@ -82,6 +82,15 @@ export default class RhsHeaderPost extends React.Component { /> </Tooltip> ); + } else if (this.props.isWebrtc) { + backToResultsTooltip = ( + <Tooltip id='backToResultsTooltip'> + <FormattedMessage + id='rhs_header.backToCallTooltip' + defaultMessage='Back to Call' + /> + </Tooltip> + ); } const expandSidebarTooltip = ( @@ -102,7 +111,7 @@ export default class RhsHeaderPost extends React.Component { </Tooltip> ); - if (this.props.fromSearch || this.props.fromFlaggedPosts) { + if (this.props.fromSearch || this.props.fromFlaggedPosts || this.props.isWebrtc) { back = ( <a href='#' @@ -178,6 +187,7 @@ RhsHeaderPost.defaultProps = { }; RhsHeaderPost.propTypes = { isMentionSearch: React.PropTypes.bool, + isWebrtc: React.PropTypes.bool, fromSearch: React.PropTypes.string, fromFlaggedPosts: React.PropTypes.bool, toggleSize: React.PropTypes.function, |