Pārlūkot izejas kodu

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

master
Aaron van Meerten 8 gadus atpakaļ
vecāks
revīzija
d752e8b864

+ 2
- 2
react/features/conference/route.js Parādīt failu

114
     const { caller } = state['features/jwt'];
114
     const { caller } = state['features/jwt'];
115
 
115
 
116
     if (caller) {
116
     if (caller) {
117
-        const { avatarUrl, email, name } = caller;
117
+        const { avatarUrl, avatar, email, name } = caller;
118
 
118
 
119
         APP.settings.setEmail((email || '').trim(), true);
119
         APP.settings.setEmail((email || '').trim(), true);
120
-        APP.settings.setAvatarUrl((avatarUrl || '').trim());
120
+        APP.settings.setAvatarUrl((avatarUrl || avatar || '').trim());
121
         APP.settings.setDisplayName((name || '').trim(), true);
121
         APP.settings.setDisplayName((name || '').trim(), true);
122
     }
122
     }
123
 }
123
 }

+ 2
- 2
react/features/jwt/components/CallOverlay.js Parādīt failu

158
      */
158
      */
159
     render() {
159
     render() {
160
         const { className, ringing } = this.state;
160
         const { className, ringing } = this.state;
161
-        const { avatarUrl, name } = this.props._callee;
161
+        const { avatarUrl, avatar, name } = this.props._callee;
162
 
162
 
163
         return (
163
         return (
164
             <Container
164
             <Container
171
                     </Text>
171
                     </Text>
172
                     <Avatar
172
                     <Avatar
173
                         { ...this._style('ringing__avatar') }
173
                         { ...this._style('ringing__avatar') }
174
-                        uri = { avatarUrl } />
174
+                        uri = { avatarUrl || avatar } />
175
                     <Container
175
                     <Container
176
                         { ...this._style('ringing__caller-info') }>
176
                         { ...this._style('ringing__caller-info') }>
177
                         <Text
177
                         <Text

Notiek ielāde…
Atcelt
Saglabāt