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/sidebar_right.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/sidebar_right.jsx')
-rw-r--r-- | webapp/components/sidebar_right.jsx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/webapp/components/sidebar_right.jsx b/webapp/components/sidebar_right.jsx index 6d1184799..7d9934919 100644 --- a/webapp/components/sidebar_right.jsx +++ b/webapp/components/sidebar_right.jsx @@ -5,11 +5,11 @@ import $ from 'jquery'; import SearchResults from './search_results.jsx'; import RhsThread from './rhs_thread.jsx'; - import SearchStore from 'stores/search_store.jsx'; import PostStore from 'stores/post_store.jsx'; import UserStore from 'stores/user_store.jsx'; import PreferenceStore from 'stores/preference_store.jsx'; +import WebrtcStore from 'stores/webrtc_store.jsx'; import {getFlaggedPosts} from 'actions/post_actions.jsx'; @@ -101,6 +101,8 @@ export default class SidebarRight extends React.Component { } componentDidUpdate() { + const isOpen = this.state.searchVisible || this.state.postRightVisible; + WebrtcStore.emitRhsChanged(isOpen); this.doStrangeThings(); } @@ -175,6 +177,7 @@ export default class SidebarRight extends React.Component { <RhsThread fromFlaggedPosts={this.state.fromFlaggedPosts} fromSearch={this.state.fromSearch} + isWebrtc={WebrtcStore.isBusy()} isMentionSearch={this.state.isMentionSearch} currentUser={this.state.currentUser} useMilitaryTime={this.state.useMilitaryTime} |