Browse Source

Fixes hiding toolbars.

Schedule new hide check if toolbar is hovered, overlay is shown or the sideBar container is visible (chat, contactlist , etc.).
master
damencho 9 years ago
parent
commit
686e85cd4f
1 changed files with 4 additions and 2 deletions
  1. 4
    2
      modules/UI/toolbars/ToolbarToggler.js

+ 4
- 2
modules/UI/toolbars/ToolbarToggler.js View File

35
     clearTimeout(toolbarTimeoutObject);
35
     clearTimeout(toolbarTimeoutObject);
36
     toolbarTimeoutObject = null;
36
     toolbarTimeoutObject = null;
37
 
37
 
38
-    if (Toolbar.isHovered() || APP.UI.isRingOverlayVisible()) {
38
+    if (Toolbar.isHovered()
39
+            || APP.UI.isRingOverlayVisible()
40
+            || SideContainerToggler.isVisible()) {
39
         toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout);
41
         toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout);
40
-    } else if (!SideContainerToggler.isVisible() || force) {
42
+    } else {
41
         Toolbar.hide();
43
         Toolbar.hide();
42
         $('#subject').animate({top: "-=40"}, 300);
44
         $('#subject').animate({top: "-=40"}, 300);
43
     }
45
     }

Loading…
Cancel
Save