Ver código fonte

Uses RTCUIHelper class from lib-jitsi-meet to select video elements.

master
paweldomas 10 anos atrás
pai
commit
8144201636
1 arquivos alterados com 3 adições e 27 exclusões
  1. 3
    27
      modules/UI/videolayout/SmallVideo.js

+ 3
- 27
modules/UI/videolayout/SmallVideo.js Ver arquivo

@@ -5,6 +5,8 @@ import UIUtil from "../util/UIUtil";
5 5
 
6 6
 var RTCBrowserType = require("../../RTC/RTCBrowserType");
7 7
 
8
+const RTCUIHelper = JitsiMeetJS.util.RTCUIHelper;
9
+
8 10
 function SmallVideo() {
9 11
     this.isMuted = false;
10 12
     this.hasAvatar = false;
@@ -296,33 +298,7 @@ SmallVideo.prototype.createModeratorIndicatorElement = function () {
296 298
 };
297 299
 
298 300
 SmallVideo.prototype.selectVideoElement = function () {
299
-    var videoElemName;
300
-    if (!RTCBrowserType.isTemasysPluginUsed()) {
301
-        videoElemName = 'video';
302
-        return $('#' + this.videoSpanId).find(videoElemName);
303
-    } else {
304
-        videoElemName = 'object';
305
-        var matching = $('#' + this.videoSpanId +
306
-                         (this.isLocal ? '>>' : '>') +
307
-                         videoElemName + '>param[value="video"]');
308
-        if (matching.length < 2) {
309
-            return matching.parent();
310
-        }
311
-
312
-        // there are 2 video objects from FF
313
-        // object with id which ends with '_default' (like 'remoteVideo_default')
314
-        // doesn't contain video, so we ignore it
315
-        for (var i = 0; i < matching.length; i += 1) {
316
-            var el = matching[i].parentNode;
317
-
318
-            // check id suffix
319
-            if (el.id.substr(-8) !== '_default') {
320
-                return $(el);
321
-            }
322
-        }
323
-
324
-        return $([]);
325
-    }
301
+    return $(RTCUIHelper.findVideoElement($('#' + this.videoSpanId)[0]));
326 302
 };
327 303
 
328 304
 SmallVideo.prototype.focus = function(isFocused) {

Carregando…
Cancelar
Salvar