ソースを参照

Fixes updateLarge video to change to different container types which do not have stream.

j8
damencho 9年前
コミット
1bdeda4ec3
2個のファイルの変更10行の追加4行の削除
  1. 4
    3
      modules/UI/shared_video/SharedVideo.js
  2. 6
    1
      modules/UI/videolayout/LargeVideo.js

+ 4
- 3
modules/UI/shared_video/SharedVideo.js ファイルの表示

@@ -124,13 +124,15 @@ export default class SharedVideoManager {
124 124
 
125 125
             self.isSharedVideoShown = true;
126 126
 
127
+            // If we are sending the command and we are starting the player
128
+            // we need to continuously send the player current time position
127 129
             if(APP.conference.isLocalId(self.from)) {
128 130
                 self.intervalId = setInterval(
129 131
                     self.updateCheck.bind(self),
130 132
                     self.updateInterval);
131 133
             }
132 134
 
133
-            // set initial state
135
+            // set initial state of the player if there is enough information
134 136
             if(attributes.state === 'pause')
135 137
                 player.pauseVideo();
136 138
             else if(attributes.time > 0) {
@@ -334,7 +336,7 @@ function SharedVideoThumb (url)
334 336
     this.videoSpanId = "sharedVideoContainer";
335 337
     this.container = this.createContainer(this.videoSpanId);
336 338
     this.container.onclick = this.videoClick.bind(this);
337
-    //this.bindHoverHandler();
339
+    this.bindHoverHandler();
338 340
 
339 341
     SmallVideo.call(this, VideoLayout);
340 342
     this.isVideoMuted = true;
@@ -371,7 +373,6 @@ SharedVideoThumb.prototype.createContainer = function (spanId) {
371 373
  */
372 374
 SharedVideoThumb.prototype.videoClick = function () {
373 375
     VideoLayout.handleVideoThumbClicked(true, this.url);
374
-    VideoLayout.showLargeVideoContainer(this.videoType, true);
375 376
 };
376 377
 
377 378
 /**

+ 6
- 1
modules/UI/videolayout/LargeVideo.js ファイルの表示

@@ -452,7 +452,12 @@ export default class LargeVideoManager {
452 452
             // change the avatar url on large
453 453
             this.updateAvatar(Avatar.getAvatarUrl(id));
454 454
 
455
-            let isVideoMuted = stream ? stream.isMuted() : true;
455
+            // If we the continer is VIDEO_CONTAINER_TYPE, we need to check
456
+            // its stream whether exist and is muted to set isVideoMuted
457
+            // in rest of the cases it is false
458
+            let isVideoMuted = false;
459
+            if (videoType == VIDEO_CONTAINER_TYPE)
460
+                isVideoMuted = stream ? stream.isMuted() : true;
456 461
 
457 462
             // show the avatar on large if needed
458 463
             container.showAvatar(isVideoMuted);

読み込み中…
キャンセル
保存