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

Merge pull request #872 from jitsi/fix-hiding-toolbars 

Fixes hiding toolbars.
This commit is contained in:
yanas 2016-09-14 12:16:57 -05:00 committed by GitHub
parent 297d4e65fc 686e85cd4f
commit 955680018f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/UI/toolbars/ToolbarToggler.js
View File

@ -35,9 +35,11 @@ function hideToolbar(force) {
clearTimeout(toolbarTimeoutObject); clearTimeout(toolbarTimeoutObject);
toolbarTimeoutObject = null; toolbarTimeoutObject = null;
if (Toolbar.isHovered() || APP.UI.isRingOverlayVisible()) { if (Toolbar.isHovered()
|| APP.UI.isRingOverlayVisible()
|| SideContainerToggler.isVisible()) {
toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout); toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout);
} else if (!SideContainerToggler.isVisible() || force) { } else {
Toolbar.hide(); Toolbar.hide();
$('#subject').animate({top: "-=40"}, 300); $('#subject').animate({top: "-=40"}, 300);
} }