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

Fixes hiding toolbars.
9 years ago · 955680018f
parent 297d4e65fc 686e85cd4f
commit 955680018f
1 changed files with 4 additions and 2 deletions
--- a/modules/UI/toolbars/ToolbarToggler.js
+++ b/modules/UI/toolbars/ToolbarToggler.js
@ -35,9 +35,11 @@ function hideToolbar(force) {
    clearTimeout(toolbarTimeoutObject);
    toolbarTimeoutObject = null;

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