From 686e85cd4f6db2c82682f2a6e817d181499b304c Mon Sep 17 00:00:00 2001 From: damencho Date: Wed, 14 Sep 2016 11:51:47 -0500 Subject: [PATCH] Fixes hiding toolbars. Schedule new hide check if toolbar is hovered, overlay is shown or the sideBar container is visible (chat, contactlist , etc.). --- modules/UI/toolbars/ToolbarToggler.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/UI/toolbars/ToolbarToggler.js b/modules/UI/toolbars/ToolbarToggler.js index e8641a150..33db77b38 100644 --- 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); }