Browse Source

Fixes the issue with ether pad and the broken thumbnail selection.

master
hristoterezov 11 years ago
parent
commit
d5a2281a01
1 changed files with 39 additions and 40 deletions
  1. 39
    40
      videolayout.js

+ 39
- 40
videolayout.js View File

@@ -175,54 +175,53 @@ var VideoLayout = (function (my) {
175 175
                         ? getDesktopVideoPosition
176 176
                         : getCameraVideoPosition;
177 177
 
178
-                    if (largeVideoState.isVisible) {
179
-                        // Only if the large video is currently visible.
180
-                        // Disable previous dominant speaker video.
181
-                        if (largeVideoState.oldJid) {
182
-                            var oldResourceJid = Strophe.getResourceFromJid(largeVideoState.oldJid);
183
-                            VideoLayout.enableDominantSpeaker(oldResourceJid, false);
184
-                            if(VideoLayout.connectionIndicators) {
185
-                                var videoContainerId = null;
186
-                                if (oldResourceJid == Strophe.getResourceFromJid(connection.emuc.myroomjid)) {
187
-                                    videoContainerId = 'localVideoContainer';
188
-                                }
189
-                                else {
190
-                                    videoContainerId = 'participant_' + oldResourceJid;
191
-                                }
192
-                                if(VideoLayout.connectionIndicators[videoContainerId])
193
-                                    VideoLayout.connectionIndicators[videoContainerId].setShowHQ(false);
194
-                            }
195 178
 
179
+                    // Only if the large video is currently visible.
180
+                    // Disable previous dominant speaker video.
181
+                    if (largeVideoState.oldJid) {
182
+                        var oldResourceJid = Strophe.getResourceFromJid(largeVideoState.oldJid);
183
+                        VideoLayout.enableDominantSpeaker(oldResourceJid, false);
184
+                        if(VideoLayout.connectionIndicators) {
185
+                            var videoContainerId = null;
186
+                            if (oldResourceJid == Strophe.getResourceFromJid(connection.emuc.myroomjid)) {
187
+                                videoContainerId = 'localVideoContainer';
188
+                            }
189
+                            else {
190
+                                videoContainerId = 'participant_' + oldResourceJid;
191
+                            }
192
+                            if(VideoLayout.connectionIndicators[videoContainerId])
193
+                                VideoLayout.connectionIndicators[videoContainerId].setShowHQ(false);
196 194
                         }
197 195
 
198
-                        // Enable new dominant speaker in the remote videos section.
199
-                        if (largeVideoState.userJid) {
200
-                            var resourceJid = Strophe.getResourceFromJid(largeVideoState.userJid);
201
-                            VideoLayout.enableDominantSpeaker(resourceJid, true);
202
-                            if(VideoLayout.connectionIndicators)
203
-                            {
204
-                                var videoContainerId = null;
205
-                                if (resourceJid
206
-                                    === Strophe.getResourceFromJid(connection.emuc.myroomjid)) {
207
-                                    videoContainerId = 'localVideoContainer';
208
-                                }
209
-                                else {
210
-                                    videoContainerId = 'participant_' + resourceJid;
211
-                                }
212
-                                if(VideoLayout.connectionIndicators[videoContainerId])
213
-                                    VideoLayout.connectionIndicators[videoContainerId].setShowHQ(true);
214
-                            }
196
+                    }
215 197
 
198
+                    // Enable new dominant speaker in the remote videos section.
199
+                    if (largeVideoState.userJid) {
200
+                        var resourceJid = Strophe.getResourceFromJid(largeVideoState.userJid);
201
+                        VideoLayout.enableDominantSpeaker(resourceJid, true);
202
+                        if(VideoLayout.connectionIndicators)
203
+                        {
204
+                            var videoContainerId = null;
205
+                            if (resourceJid
206
+                                === Strophe.getResourceFromJid(connection.emuc.myroomjid)) {
207
+                                videoContainerId = 'localVideoContainer';
208
+                            }
209
+                            else {
210
+                                videoContainerId = 'participant_' + resourceJid;
211
+                            }
212
+                            if(VideoLayout.connectionIndicators[videoContainerId])
213
+                                VideoLayout.connectionIndicators[videoContainerId].setShowHQ(true);
216 214
                         }
217 215
 
218
-                        largeVideoState.updateInProgress = false;
216
+                    }
219 217
 
220
-                        if (fade) {
221
-                            // using "this" should be ok because we're called
222
-                            // from within the fadeOut event.
223
-                            $(this).fadeIn(300);
224
-                        }
218
+                    if (fade && largeVideoState.isVisible) {
219
+                        // using "this" should be ok because we're called
220
+                        // from within the fadeOut event.
221
+                        $(this).fadeIn(300);
225 222
                     }
223
+
224
+                    largeVideoState.updateInProgress = false;
226 225
                 };
227 226
 
228 227
                 if (fade) {

Loading…
Cancel
Save