Procházet zdrojové kódy

Merge pull request #532 from damencho/resize-ds-onfilm-toggle

Resizes large video on filmstrip toggle.
master
yanas před 10 roky
rodič
revize
6a7919a904

+ 4
- 1
modules/UI/UI.js Zobrazit soubor

@@ -270,7 +270,10 @@ function registerListeners() {
270 270
 
271 271
     UI.addListener(UIEvents.TOGGLE_CONTACT_LIST, UI.toggleContactList);
272 272
 
273
-    UI.addListener(UIEvents.TOGGLE_FILM_STRIP, UI.toggleFilmStrip);
273
+    UI.addListener(UIEvents.TOGGLE_FILM_STRIP, function () {
274
+        UI.toggleFilmStrip();
275
+        VideoLayout.resizeVideoArea(PanelToggler.isVisible(), true, false);
276
+    });
274 277
 }
275 278
 
276 279
 /**

+ 1
- 1
modules/UI/side_pannels/SidePanelToggler.js Zobrazit soubor

@@ -93,7 +93,7 @@ function toggle (object, selector, onOpenComplete,
93 93
 function resizeVideoArea(isSidePanelVisible, completeFunction) {
94 94
     VideoLayout.resizeVideoArea(!isSidePanelVisible,
95 95
         false,
96
-        true,
96
+        false,
97 97
         completeFunction);
98 98
 }
99 99
 

+ 5
- 4
modules/UI/videolayout/VideoLayout.js Zobrazit soubor

@@ -798,10 +798,11 @@ var VideoLayout = {
798 798
      * @param forceUpdate indicates that hidden thumbnails will be shown
799 799
      * @param completeFunction a function to be called when the video area is
800 800
      * resized.
801
-     */resizeVideoArea (isSideBarVisible,
802
-                        forceUpdate = false,
803
-                        animate = false,
804
-                        completeFunction = null) {
801
+     */
802
+    resizeVideoArea (isSideBarVisible,
803
+                    forceUpdate = false,
804
+                    animate = false,
805
+                    completeFunction = null) {
805 806
 
806 807
         if (largeVideo) {
807 808
             largeVideo.updateContainerSize(isSideBarVisible);

Načítá se…
Zrušit
Uložit