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/loading_screen.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/loading_screen.jsx')
-rw-r--r-- | webapp/components/loading_screen.jsx | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/webapp/components/loading_screen.jsx b/webapp/components/loading_screen.jsx index 9f4abf7f6..288eda389 100644 --- a/webapp/components/loading_screen.jsx +++ b/webapp/components/loading_screen.jsx @@ -11,6 +11,17 @@ export default class LoadingScreen extends React.Component { this.state = {}; } render() { + let message = ( + <FormattedMessage + id='loading_screen.loading' + defaultMessage='Loading' + /> + ); + + if (this.props.message) { + message = this.props.message; + } + return ( <div className='loading-screen' @@ -18,10 +29,7 @@ export default class LoadingScreen extends React.Component { > <div className='loading__content'> <h3> - <FormattedMessage - id='loading_screen.loading' - defaultMessage='Loading' - /> + {message} </h3> <div className='round round-1'></div> <div className='round round-2'></div> @@ -36,5 +44,6 @@ LoadingScreen.defaultProps = { position: 'relative' }; LoadingScreen.propTypes = { - position: React.PropTypes.oneOf(['absolute', 'fixed', 'relative', 'static', 'inherit']) + position: React.PropTypes.oneOf(['absolute', 'fixed', 'relative', 'static', 'inherit']), + message: React.PropTypes.node }; |