haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Fix problem with resizing
This commit is contained in:
yanas 2016-09-04 20:16:08 -05:00 committed by GitHub
parent e3f599fbc0 aea99b8ffb
commit 2f966b7da4
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/UI/UI.js
View File

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

2
modules/UI/toolbars/BottomToolbar.js
View File

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