Преглед изворни кода

Fixes issue with missing avatar for Jigasi user. Fixes issue with avatar not being displayed when user has no video. Removed duplicated logic for checking video muted status(removed from LargeVideo which exists in SmallVideo).

master
paweldomas пре 9 година
родитељ
комит
2ffe178456

+ 3
- 2
modules/UI/avatar/Avatar.js Прегледај датотеку

52
         }
52
         }
53
         var id = users[jid];
53
         var id = users[jid];
54
         if (!id) {
54
         if (!id) {
55
-            console.warn("No avatar stored yet for " + jid);
56
-            return null;
55
+            console.warn(
56
+                "No avatar stored yet for " + jid + " - using JID as ID");
57
+            id = jid;
57
         }
58
         }
58
         return 'https://www.gravatar.com/avatar/' +
59
         return 'https://www.gravatar.com/avatar/' +
59
             MD5.hexdigest(id.trim().toLowerCase()) +
60
             MD5.hexdigest(id.trim().toLowerCase()) +

+ 2
- 13
modules/UI/videolayout/LargeVideo.js Прегледај датотеку

224
     var url = Avatar.getActiveSpeakerUrl(jid);
224
     var url = Avatar.getActiveSpeakerUrl(jid);
225
     if (avatar.src === url)
225
     if (avatar.src === url)
226
         return;
226
         return;
227
-    var isMuted = null;
228
-    if (!currentSmallVideo.isLocal &&
229
-       !LargeVideo.VideoLayout.isInLastN(currentSmallVideo.getResourceJid())) {
230
-        isMuted = true;
231
-    }
232
-    else
233
-    {
234
-        isMuted = APP.RTC.isVideoMuted(jid);
235
-    }
236
-
237
-    if (jid && isMuted !== null) {
227
+    if (jid) {
238
         avatar.src = url;
228
         avatar.src = url;
239
-        $("#largeVideo").css("visibility", isMuted ? "hidden" : "visible");
240
-        currentSmallVideo.showAvatar(isMuted);
229
+        currentSmallVideo.showAvatar();
241
     }
230
     }
242
 }
231
 }
243
 
232
 

+ 3
- 1
modules/UI/videolayout/SmallVideo.js Прегледај датотеку

325
         }
325
         }
326
         else
326
         else
327
         {
327
         {
328
-            show = APP.RTC.isVideoMuted(this.peerJid);
328
+            // We want to show the avatar when the video is muted or not exists
329
+            // that is when 'true' or 'null' is returned
330
+            show = APP.RTC.isVideoMuted(this.peerJid) !== false;
329
         }
331
         }
330
 
332
 
331
     }
333
     }

+ 3
- 2
modules/UI/videolayout/VideoLayout.js Прегледај датотеку

864
         if(!isVisible && focusedVideoResourceJid)
864
         if(!isVisible && focusedVideoResourceJid)
865
         {
865
         {
866
             var smallVideo = VideoLayout.getSmallVideo(focusedVideoResourceJid);
866
             var smallVideo = VideoLayout.getSmallVideo(focusedVideoResourceJid);
867
-            if(smallVideo)
867
+            if(smallVideo) {
868
                 smallVideo.focus(false);
868
                 smallVideo.focus(false);
869
-            smallVideo.showAvatar();
869
+                smallVideo.showAvatar();
870
+            }
870
             focusedVideoResourceJid = null;
871
             focusedVideoResourceJid = null;
871
         }
872
         }
872
     };
873
     };

Loading…
Откажи
Сачувај