fixed scroll top bug in fixed layout mode

hot588 · Jul 8, 2019 · a1734ea · a1734ea
1 parent f6a5d05
commit a1734ea
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/build/js/Layout.js b/build/js/Layout.js
@@ -23,6 +23,8 @@
  layoutBoxed : '.layout-boxed',
  mainFooter : '.main-footer',
  mainHeader : '.main-header',
+ mainSidebar : '.main-sidebar',
+ slimScrollDiv : 'slimScrollDiv',
  sidebar : '.sidebar',
  controlSidebar: '.control-sidebar',
  fixed : '.fixed',
@@ -130,9 +132,11 @@
  // $(Selector.sidebar).slimScroll({ destroy: true }).height('auto')
 
  // Add slimscroll
- $(Selector.sidebar).slimScroll({
- height: ($(window).height() - $(Selector.mainHeader).height()) + 'px'
- });
+ if ($(Selector.mainSidebar).find(Selector.slimScrollDiv).length === 0) {
+ $(Selector.sidebar).slimScroll({
+ height: ($(window).height() - $(Selector.mainHeader).height()) + 'px'
+ });
+ }
  }
  }
  };

diff --git a/dist/js/adminlte.js b/dist/js/adminlte.js
@@ -986,6 +986,8 @@ throw new Error('AdminLTE requires jQuery')
  layoutBoxed : '.layout-boxed',
  mainFooter : '.main-footer',
  mainHeader : '.main-header',
+ mainSidebar : '.main-sidebar',
+ slimScrollDiv : 'slimScrollDiv',
  sidebar : '.sidebar',
  controlSidebar: '.control-sidebar',
  fixed : '.fixed',
@@ -1093,9 +1095,11 @@ throw new Error('AdminLTE requires jQuery')
  // $(Selector.sidebar).slimScroll({ destroy: true }).height('auto')
 
  // Add slimscroll
- $(Selector.sidebar).slimScroll({
- height: ($(window).height() - $(Selector.mainHeader).height()) + 'px'
- });
+ if ($(Selector.mainSidebar).find(Selector.slimScrollDiv).length === 0) {
+ $(Selector.sidebar).slimScroll({
+ height: ($(window).height() - $(Selector.mainHeader).height()) + 'px'
+ });
+ }
  }
  }
  };