removed screenCollapseSize option for PushMenu and removed isShown()

pull/2256/head
REJack 2019-09-19 13:34:26 +02:00
parent c950273d43
commit 5af52cf9df
No known key found for this signature in database
GPG Key ID: 9F3976CC630CC888
3 changed files with 19 additions and 38 deletions

View File

@ -23,7 +23,6 @@ const PushMenu = (($) => {
const Default = { const Default = {
autoCollapseSize: false, autoCollapseSize: false,
screenCollapseSize: 768,
enableRemember: false, enableRemember: false,
noTransitionAfterReload: true noTransitionAfterReload: true
} }
@ -40,8 +39,7 @@ const PushMenu = (($) => {
const ClassName = { const ClassName = {
SIDEBAR_OPEN: 'sidebar-open', SIDEBAR_OPEN: 'sidebar-open',
COLLAPSED: 'sidebar-collapse', COLLAPSED: 'sidebar-collapse',
OPEN: 'sidebar-open', OPEN: 'sidebar-open'
SIDEBAR_MINI: 'sidebar-mini'
} }
/** /**
@ -54,11 +52,16 @@ const PushMenu = (($) => {
this._element = element this._element = element
this._options = $.extend({}, Default, options) this._options = $.extend({}, Default, options)
this._init()
if (!$(Selector.BODY).hasClass(ClassName.COLLAPSED) && !$(Selector.BODY).hasClass(ClassName.OPEN)) {
$(Selector.BODY).addClass(ClassName.OPEN)
}
if (!$(Selector.OVERLAY).length) { if (!$(Selector.OVERLAY).length) {
this._addOverlay() this._addOverlay()
} }
this._init()
} }
// Public // Public
@ -67,7 +70,7 @@ const PushMenu = (($) => {
$(Selector.BODY).addClass(ClassName.OPEN).removeClass(ClassName.COLLAPSED) $(Selector.BODY).addClass(ClassName.OPEN).removeClass(ClassName.COLLAPSED)
if(this._options.enableRemember) { if(this._options.enableRemember) {
localStorage.setItem(`remember${EVENT_KEY}`, ClassName.OPEN); localStorage.setItem(`remember${EVENT_KEY}`, ClassName.OPEN)
} }
const shownEvent = $.Event(Event.SHOWN) const shownEvent = $.Event(Event.SHOWN)
@ -78,23 +81,15 @@ const PushMenu = (($) => {
$(Selector.BODY).removeClass(ClassName.OPEN).addClass(ClassName.COLLAPSED) $(Selector.BODY).removeClass(ClassName.OPEN).addClass(ClassName.COLLAPSED)
if(this._options.enableRemember) { if(this._options.enableRemember) {
localStorage.setItem(`remember${EVENT_KEY}`, ClassName.COLLAPSED); localStorage.setItem(`remember${EVENT_KEY}`, ClassName.COLLAPSED)
} }
const collapsedEvent = $.Event(Event.COLLAPSED) const collapsedEvent = $.Event(Event.COLLAPSED)
$(this._element).trigger(collapsedEvent) $(this._element).trigger(collapsedEvent)
} }
isShown() {
if ($(window).width() >= this._options.screenCollapseSize) {
return !$(Selector.BODY).hasClass(ClassName.COLLAPSED)
} else {
return $(Selector.BODY).hasClass(ClassName.OPEN)
}
}
toggle() { toggle() {
if (this.isShown()) { if ($(Selector.BODY).hasClass(ClassName.OPEN)) {
this.collapse() this.collapse()
} else { } else {
this.show() this.show()
@ -104,11 +99,11 @@ const PushMenu = (($) => {
autoCollapse() { autoCollapse() {
if (this._options.autoCollapseSize) { if (this._options.autoCollapseSize) {
if ($(window).width() <= this._options.autoCollapseSize) { if ($(window).width() <= this._options.autoCollapseSize) {
if (this.isShown()) { if ($(Selector.BODY).hasClass(ClassName.OPEN)) {
this.toggle() this.toggle()
} }
} else { } else {
if (!this.isShown()) { if (!$(Selector.BODY).hasClass(ClassName.OPEN)) {
this.toggle() this.toggle()
} }
} }
@ -117,24 +112,24 @@ const PushMenu = (($) => {
remember() { remember() {
if(this._options.enableRemember) { if(this._options.enableRemember) {
var toggleState = localStorage.getItem(`remember${EVENT_KEY}`); let toggleState = localStorage.getItem(`remember${EVENT_KEY}`)
if (toggleState == ClassName.COLLAPSED){ if (toggleState == ClassName.COLLAPSED){
if (this._options.noTransitionAfterReload) { if (this._options.noTransitionAfterReload) {
$("body").addClass('hold-transition').addClass(ClassName.COLLAPSED).delay(50).queue(function() { $("body").addClass('hold-transition').addClass(ClassName.COLLAPSED).delay(50).queue(function() {
$(this).removeClass('hold-transition'); $(this).removeClass('hold-transition')
$(this).dequeue() $(this).dequeue()
}); })
} else { } else {
$("body").addClass(ClassName.COLLAPSED); $("body").addClass(ClassName.COLLAPSED)
} }
} else { } else {
if (this._options.noTransitionAfterReload) { if (this._options.noTransitionAfterReload) {
$("body").addClass('hold-transition').removeClass(ClassName.COLLAPSED).delay(50).queue(function() { $("body").addClass('hold-transition').removeClass(ClassName.COLLAPSED).delay(50).queue(function() {
$(this).removeClass('hold-transition'); $(this).removeClass('hold-transition')
$(this).dequeue() $(this).dequeue()
}); })
} else { } else {
$("body").removeClass(ClassName.COLLAPSED); $("body").removeClass(ClassName.COLLAPSED)
} }
} }
} }

View File

@ -176,19 +176,6 @@
z-index: $zindex-main-sidebar - 1; z-index: $zindex-main-sidebar - 1;
} }
.sidebar-mini-md {
&.sidebar-open {
#sidebar-overlay {
@include media-breakpoint-up(sm) {
display: none;
}
@include media-breakpoint-down(sm) {
display: block;
}
}
}
}
[class*='sidebar-light-'] { [class*='sidebar-light-'] {
// Sidebar background color // Sidebar background color
background-color: $sidebar-light-bg; background-color: $sidebar-light-bg;

View File

@ -28,7 +28,6 @@ $('.sidebar-toggle-btn').PushMenu(options)
| Name | Type | Default | Description | Name | Type | Default | Description
|-|-|-|- |-|-|-|-
|autoCollapseSize | Boolean/Number | FALSE | Screen width in pixels to trigger auto collapse sidebar |autoCollapseSize | Boolean/Number | FALSE | Screen width in pixels to trigger auto collapse sidebar
|screenCollapseSize | Number | 768 | Screen width in pixels for small screens.
|enableRemember | Boolean | FALSE | Remember sidebar state and set after page refresh. |enableRemember | Boolean | FALSE | Remember sidebar state and set after page refresh.
|noTransitionAfterReload | Boolean | TRUE | Hold Transition after page refresh. |noTransitionAfterReload | Boolean | TRUE | Hold Transition after page refresh.
{: .table .table-bordered .bg-light} {: .table .table-bordered .bg-light}