Просмотр исходного кода

ref(filmstrip): create an empty container for local filmstrip move (#3303)

* ref(filmstrip): create an empty container for local filmstrip move

This might be necessary for tile view. To support making the
local video display at the end of remote videos while in tile
view, but separateed from scrollable remote videos, moving
the local video might be necessary. By creating an empty
container, there is a target for local video to move to.

* squash: rename id
master
virtuacoplenny 6 лет назад
Родитель
Сommit
34d1eb6768

+ 6
- 2
modules/UI/shared_video/SharedVideoThumb.js Просмотреть файл

@@ -50,10 +50,14 @@ SharedVideoThumb.prototype.createContainer = function(spanId) {
50 50
     displayNameContainer.className = 'displayNameContainer';
51 51
     container.appendChild(displayNameContainer);
52 52
 
53
-    const remotes = document.getElementById('filmstripRemoteVideosContainer');
53
+    const remoteVideosContainer
54
+        = document.getElementById('filmstripRemoteVideosContainer');
55
+    const localVideoContainer
56
+        = document.getElementById('localVideoTileViewContainer');
54 57
 
58
+    remoteVideosContainer.insertBefore(container, localVideoContainer);
55 59
 
56
-    return remotes.appendChild(container);
60
+    return container;
57 61
 };
58 62
 
59 63
 /**

+ 6
- 2
modules/UI/videolayout/RemoteVideo.js Просмотреть файл

@@ -642,10 +642,14 @@ RemoteVideo.createContainer = function(spanId) {
642 642
         <div class ='presence-label-container'></div>
643 643
         <span class = 'remotevideomenu'></span>`;
644 644
 
645
-    const remotes = document.getElementById('filmstripRemoteVideosContainer');
645
+    const remoteVideosContainer
646
+        = document.getElementById('filmstripRemoteVideosContainer');
647
+    const localVideoContainer
648
+        = document.getElementById('localVideoTileViewContainer');
646 649
 
650
+    remoteVideosContainer.insertBefore(container, localVideoContainer);
647 651
 
648
-    return remotes.appendChild(container);
652
+    return container;
649 653
 };
650 654
 
651 655
 export default RemoteVideo;

+ 3
- 1
react/features/filmstrip/components/web/Filmstrip.js Просмотреть файл

@@ -119,7 +119,9 @@ class Filmstrip extends Component <Props> {
119 119
                             className = 'remote-videos-container'
120 120
                             id = 'filmstripRemoteVideosContainer'
121 121
                             onMouseOut = { this._onMouseOut }
122
-                            onMouseOver = { this._onMouseOver } />
122
+                            onMouseOver = { this._onMouseOver }>
123
+                            <div id = 'localVideoTileViewContainer' />
124
+                        </div>
123 125
                     </div>
124 126
                 </div>
125 127
             </div>

Загрузка…
Отмена
Сохранить