From b835bb678bfdd5af3363fd4a467141de11aebfd9 Mon Sep 17 00:00:00 2001 From: REJack Date: Thu, 26 Nov 2020 16:15:10 +0100 Subject: [PATCH] rework content height events - add mouse enter/leave event - add timeout on expand/collapse sidebar event --- build/js/Layout.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/build/js/Layout.js b/build/js/Layout.js index 8381b8cd9..c5c90e790 100644 --- a/build/js/Layout.js +++ b/build/js/Layout.js @@ -27,6 +27,7 @@ const SELECTOR_PUSHMENU_BTN = '[data-widget="pushmenu"]' const SELECTOR_LOGIN_BOX = '.login-box' const SELECTOR_REGISTER_BOX = '.register-box' +const CLASS_NAME_SIDEBAR_COLLAPSED = 'sidebar-collapse' const CLASS_NAME_SIDEBAR_FOCUSED = 'sidebar-focused' const CLASS_NAME_LAYOUT_FIXED = 'layout-fixed' const CLASS_NAME_CONTROL_SIDEBAR_SLIDE_OPEN = 'control-sidebar-slide-open' @@ -156,9 +157,18 @@ class Layout { this.fixLayoutHeight() }) + $(SELECTOR_MAIN_SIDEBAR) + .on('mouseenter mouseleave', () => { + if ($('body').hasClass(CLASS_NAME_SIDEBAR_COLLAPSED)) { + this.fixLayoutHeight() + } + }) + $(SELECTOR_PUSHMENU_BTN) .on('collapsed.lte.pushmenu shown.lte.pushmenu', () => { - this.fixLayoutHeight() + setTimeout(() => { + this.fixLayoutHeight() + }, 300) }) $(SELECTOR_CONTROL_SIDEBAR_BTN)