Merge pull request #829 from BeatC/fix-sharing-resize-after-hiding-filmstrip

Fix problem with resizing
pull/838/head 1212
yanas 9 years ago committed by GitHub
commit 2f966b7da4
  1. 14
      modules/UI/UI.js
  2. 2
      modules/UI/toolbars/BottomToolbar.js

@ -332,6 +332,14 @@ UI.mucJoined = function () {
VideoLayout.mucJoined();
};
/***
* Handler for toggling filmstrip
*/
UI.handleToggleFilmStrip = () => {
UI.toggleFilmStrip();
VideoLayout.resizeVideoArea(PanelToggler.isVisible(), true, false);
};
/**
* Setup some UI event listeners.
*/
@ -359,10 +367,7 @@ function registerListeners() {
UI.addListener(UIEvents.TOGGLE_CONTACT_LIST, UI.toggleContactList);
UI.addListener(UIEvents.TOGGLE_FILM_STRIP, function () {
UI.toggleFilmStrip();
VideoLayout.resizeVideoArea(PanelToggler.isVisible(), true, false);
});
UI.addListener(UIEvents.TOGGLE_FILM_STRIP, UI.handleToggleFilmStrip);
UI.addListener(UIEvents.FOLLOW_ME_ENABLED, function (isEnabled) {
if (followMeHandler)
@ -516,7 +521,6 @@ UI.start = function () {
return true;
};
/**
* Show local stream on UI.
* @param {JitsiTrack} track stream to show

@ -15,7 +15,7 @@ const defaultBottomToolbarButtons = {
shortcutAttr: "filmstripPopover",
shortcutFunc: function() {
JitsiMeetJS.analytics.sendEvent("shortcut.film.toggled");
APP.UI.toggleFilmStrip();
APP.UI.handleToggleFilmStrip();
},
shortcutDescription: "keyboardShortcuts.toggleFilmstrip"
}

Loading…
Cancel
Save