haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

accept 'avatar' as well as 'avatarUrl' for avatar field

This commit is contained in:
Aaron van Meerten 2017-07-13 14:45:55 -05:00 committed by Дамян Минков
parent d335669afe
commit d752e8b864
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
react/features/conference/route.js
View File

@ -114,10 +114,10 @@ function _setTokenData() {
const { caller } = state['features/jwt']; const { caller } = state['features/jwt'];
if (caller) { if (caller) {
const { avatarUrl, email, name } = caller; const { avatarUrl, avatar, email, name } = caller;
APP.settings.setEmail((email || '').trim(), true); APP.settings.setEmail((email || '').trim(), true);
APP.settings.setAvatarUrl((avatarUrl || '').trim()); APP.settings.setAvatarUrl((avatarUrl || avatar || '').trim());
APP.settings.setDisplayName((name || '').trim(), true); APP.settings.setDisplayName((name || '').trim(), true);
} }
} }

4
react/features/jwt/components/CallOverlay.js
View File

@ -158,7 +158,7 @@ class CallOverlay extends Component {
*/ */
render() { render() {
const { className, ringing } = this.state; const { className, ringing } = this.state;
const { avatarUrl, name } = this.props._callee; const { avatarUrl, avatar, name } = this.props._callee;
return ( return (
<Container <Container
@ -171,7 +171,7 @@ class CallOverlay extends Component {
</Text> </Text>
<Avatar <Avatar
{ ...this._style('ringing__avatar') } { ...this._style('ringing__avatar') }
uri = { avatarUrl } /> uri = { avatarUrl || avatar } />
<Container <Container
{ ...this._style('ringing__caller-info') }> { ...this._style('ringing__caller-info') }>
<Text <Text