Skip to content

Ensure left bar trigger and collapsed state stay in sync #16748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 3.x
Choose a base branch
from
Open

Ensure left bar trigger and collapsed state stay in sync #16748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions manager/assets/modext/core/modx.layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,7 @@ Ext.extend(MODx.Layout, Ext.Viewport, {
this.el.dom.style.display = 'none';
}
this.collapsed = true;
Ext.get('modx-leftbar-trigger').addClass('collapsed');
this.saveState();
this.fireEvent('collapse', this);
return this;
Expand All @@ -416,6 +417,7 @@ Ext.extend(MODx.Layout, Ext.Viewport, {
this.el.dom.style.display = '';
}
this.collapsed = false;
Ext.get('modx-leftbar-trigger').removeClass('collapsed');
this.saveState();
this.fireEvent('expand', this);
return this;
Expand All @@ -427,15 +429,10 @@ Ext.extend(MODx.Layout, Ext.Viewport, {
},
afterrender: function() {
const trigger = Ext.get('modx-leftbar-trigger');
if (this.collapsed) {
trigger.addClass('collapsed');
}
trigger.on('click', function() {
if (this.collapsed) {
trigger.removeClass('collapsed');
this.expand(true);
} else {
trigger.addClass('collapsed');
this.collapse(true);
}
}, this);
Expand Down Expand Up @@ -749,15 +746,14 @@ Ext.extend(MODx.Layout, Ext.Viewport, {
});
}
}
// Why here & why assuming visible ??
,leftbarVisible: true
/**
* Toggle left bar
*/
,toggleLeftbar: function() {
this.leftbarVisible ? this.hideLeftbar(true) : this.showLeftbar(true);
// Toggle the left bar visibility
this.leftbarVisible = !this.leftbarVisible;
Ext.getCmp('modx-leftbar-tabs').collapsed
? this.showLeftbar(true)
: this.hideLeftbar(true)
;
}
/**
* Hide the left bar
Expand All @@ -766,6 +762,7 @@ Ext.extend(MODx.Layout, Ext.Viewport, {
* @param {Boolean} [state] Whether or not to save the component's state
*/
,hideLeftbar: function(anim, state) {
Ext.get('modx-leftbar-trigger').addClass('collapsed');
Ext.getCmp('modx-leftbar-tabs').collapse(anim);
if (Ext.isBoolean(state)) {
this.stateSave = state;
Expand All @@ -777,6 +774,7 @@ Ext.extend(MODx.Layout, Ext.Viewport, {
* @param {Boolean} [anim] Whether or not to animate the transition
*/
,showLeftbar: function(anim) {
Ext.get('modx-leftbar-trigger').removeClass('collapsed');
Ext.getCmp('modx-leftbar-tabs').expand(anim);
}
/**
Expand Down