|
@@ -85,20 +85,32 @@ const FilmStrip = {
|
85
|
85
|
*/
|
86
|
86
|
let videoAreaAvailableWidth
|
87
|
87
|
= UIUtil.getAvailableVideoWidth(isSideBarVisible)
|
88
|
|
- - parseInt(this.filmStrip.css('right'), 10)
|
89
|
|
- - parseInt(this.filmStrip.css('paddingLeft'), 10)
|
90
|
|
- - parseInt(this.filmStrip.css('paddingRight'), 10)
|
91
|
|
- - parseInt(this.filmStrip.css('borderLeftWidth'), 10)
|
92
|
|
- - parseInt(this.filmStrip.css('borderRightWidth'), 10) - 5;
|
93
|
|
-
|
94
|
|
- let availableWidth = Math.floor(
|
|
88
|
+ - UIUtil.parseCssInt(this.filmStrip.css('right'), 10)
|
|
89
|
+ - UIUtil.parseCssInt(this.filmStrip.css('paddingLeft'), 10)
|
|
90
|
+ - UIUtil.parseCssInt(this.filmStrip.css('paddingRight'), 10)
|
|
91
|
+ - UIUtil.parseCssInt(this.filmStrip.css('borderLeftWidth'), 10)
|
|
92
|
+ - UIUtil.parseCssInt(this.filmStrip.css('borderRightWidth'), 10)
|
|
93
|
+ - 5;
|
|
94
|
+
|
|
95
|
+ let availableWidth = videoAreaAvailableWidth;
|
|
96
|
+
|
|
97
|
+ // If the number of videos is 0 or undefined we don't need to calculate
|
|
98
|
+ // further.
|
|
99
|
+ if (numvids)
|
|
100
|
+ availableWidth = Math.floor(
|
95
|
101
|
(videoAreaAvailableWidth - numvids * (
|
96
|
|
- parseInt(localVideoContainer.css('borderLeftWidth'), 10)
|
97
|
|
- + parseInt(localVideoContainer.css('borderRightWidth'), 10)
|
98
|
|
- + parseInt(localVideoContainer.css('paddingLeft'), 10)
|
99
|
|
- + parseInt(localVideoContainer.css('paddingRight'), 10)
|
100
|
|
- + parseInt(localVideoContainer.css('marginLeft'), 10)
|
101
|
|
- + parseInt(localVideoContainer.css('marginRight'), 10)))
|
|
102
|
+ UIUtil.parseCssInt(
|
|
103
|
+ localVideoContainer.css('borderLeftWidth'), 10)
|
|
104
|
+ + UIUtil.parseCssInt(
|
|
105
|
+ localVideoContainer.css('borderRightWidth'), 10)
|
|
106
|
+ + UIUtil.parseCssInt(
|
|
107
|
+ localVideoContainer.css('paddingLeft'), 10)
|
|
108
|
+ + UIUtil.parseCssInt(
|
|
109
|
+ localVideoContainer.css('paddingRight'), 10)
|
|
110
|
+ + UIUtil.parseCssInt(
|
|
111
|
+ localVideoContainer.css('marginLeft'), 10)
|
|
112
|
+ + UIUtil.parseCssInt(
|
|
113
|
+ localVideoContainer.css('marginRight'), 10)))
|
102
|
114
|
/ numvids);
|
103
|
115
|
|
104
|
116
|
let maxHeight
|
|
@@ -155,7 +167,12 @@ const FilmStrip = {
|
155
|
167
|
selector += ':visible';
|
156
|
168
|
}
|
157
|
169
|
|
158
|
|
- return this.filmStrip.children(selector);
|
|
170
|
+ // Exclude the local video container if it has been hidden.
|
|
171
|
+ if ($("#localVideoContainer").hasClass("hidden"))
|
|
172
|
+ return this.filmStrip.children(selector)
|
|
173
|
+ .not("#localVideoContainer");
|
|
174
|
+ else
|
|
175
|
+ return this.filmStrip.children(selector);
|
159
|
176
|
}
|
160
|
177
|
};
|
161
|
178
|
|