From ca56734d9cc735e6cbfe7043f02deb7bf34e7870 Mon Sep 17 00:00:00 2001 From: damencho Date: Tue, 15 Mar 2016 15:42:53 -0500 Subject: [PATCH] Moves VideoLayout reference in SmallVideo as it is used there in updateView. --- modules/UI/videolayout/LocalVideo.js | 3 +-- modules/UI/videolayout/RemoteVideo.js | 3 +-- modules/UI/videolayout/SmallVideo.js | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/UI/videolayout/LocalVideo.js b/modules/UI/videolayout/LocalVideo.js index c108e3252..380e9d7cc 100644 --- a/modules/UI/videolayout/LocalVideo.js +++ b/modules/UI/videolayout/LocalVideo.js @@ -13,7 +13,6 @@ function LocalVideo(VideoLayout, emitter) { this.videoSpanId = "localVideoContainer"; this.container = $("#localVideoContainer").get(0); this.bindHoverHandler(); - this.VideoLayout = VideoLayout; this.flipX = true; this.isLocal = true; this.emitter = emitter; @@ -22,7 +21,7 @@ function LocalVideo(VideoLayout, emitter) { return APP.conference.localId; } }); - SmallVideo.call(this); + SmallVideo.call(this, VideoLayout); } LocalVideo.prototype = Object.create(SmallVideo.prototype); diff --git a/modules/UI/videolayout/RemoteVideo.js b/modules/UI/videolayout/RemoteVideo.js index d9f4dae10..60c9fbcf9 100644 --- a/modules/UI/videolayout/RemoteVideo.js +++ b/modules/UI/videolayout/RemoteVideo.js @@ -11,14 +11,13 @@ function RemoteVideo(id, VideoLayout, emitter) { this.id = id; this.emitter = emitter; this.videoSpanId = `participant_${id}`; - this.VideoLayout = VideoLayout; + SmallVideo.call(this, VideoLayout); this.addRemoteVideoContainer(); this.connectionIndicator = new ConnectionIndicator(this, id); this.setDisplayName(); this.bindHoverHandler(); this.flipX = false; this.isLocal = false; - SmallVideo.call(this); } RemoteVideo.prototype = Object.create(SmallVideo.prototype); diff --git a/modules/UI/videolayout/SmallVideo.js b/modules/UI/videolayout/SmallVideo.js index e55eafec6..fa5bac0bf 100644 --- a/modules/UI/videolayout/SmallVideo.js +++ b/modules/UI/videolayout/SmallVideo.js @@ -5,12 +5,13 @@ import UIUtil from "../util/UIUtil"; const RTCUIHelper = JitsiMeetJS.util.RTCUIHelper; -function SmallVideo() { +function SmallVideo(VideoLayout) { this.isMuted = false; this.hasAvatar = false; this.isVideoMuted = false; this.videoStream = null; this.audioStream = null; + this.VideoLayout = VideoLayout; } function setVisibility(selector, show) {