Skip to content

Commit 7b6e000

Browse files
committed
fixed control-sidebar slide option
- renamed `slide` to `controlsidebarSlide` to avoid bootstrap js error - reworked js to get slide false working without transition - added .control-sidebar-hold-transition
1 parent d3a213a commit 7b6e000

File tree

8 files changed

+53
-13
lines changed

8 files changed

+53
-13
lines changed

build/js/ControlSidebar.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
var DataKey = 'lte.controlsidebar';
1313

1414
var Default = {
15-
slide: true
15+
controlsidebarSlide: true
1616
};
1717

1818
var Selector = {
@@ -26,7 +26,8 @@
2626
};
2727

2828
var ClassName = {
29-
open : 'control-sidebar-open',
29+
open: 'control-sidebar-open',
30+
transition: 'control-sidebar-hold-transition',
3031
fixed: 'fixed'
3132
};
3233

@@ -72,8 +73,11 @@
7273

7374
ControlSidebar.prototype.expand = function () {
7475
$(Selector.sidebar).show();
75-
if (!this.options.slide) {
76-
$('body').addClass(ClassName.open);
76+
if (!this.options.controlsidebarSlide) {
77+
$('body').addClass(ClassName.transition).addClass(ClassName.open).delay(50).queue(function(){
78+
$('body').removeClass(ClassName.transition);
79+
$(this).dequeue()
80+
})
7781
} else {
7882
$(Selector.sidebar).addClass(ClassName.open);
7983
}
@@ -83,7 +87,14 @@
8387
};
8488

8589
ControlSidebar.prototype.collapse = function () {
86-
$('body, ' + Selector.sidebar).removeClass(ClassName.open);
90+
if (!this.options.controlsidebarSlide) {
91+
$('body').addClass(ClassName.transition).removeClass(ClassName.open).delay(50).queue(function(){
92+
$('body').removeClass(ClassName.transition);
93+
$(this).dequeue()
94+
})
95+
} else {
96+
$(Selector.sidebar).removeClass(ClassName.open);
97+
}
8798
$(Selector.sidebar).fadeOut();
8899
$(this.element).trigger($.Event(Event.collapsed));
89100
};

build/less/control-sidebar.less

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@
4141
}
4242

4343
// Open without slide over content
44+
.control-sidebar-hold-transition {
45+
.control-sidebar-bg,
46+
.control-sidebar,
47+
.content-wrapper {
48+
transition: none;
49+
}
50+
51+
}
4452
.control-sidebar-open {
4553
.control-sidebar-bg,
4654
.control-sidebar {

dist/css/AdminLTE.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,11 @@ a:focus {
748748
.control-sidebar.control-sidebar-open + .control-sidebar-bg {
749749
right: 0;
750750
}
751+
.control-sidebar-hold-transition .control-sidebar-bg,
752+
.control-sidebar-hold-transition .control-sidebar,
753+
.control-sidebar-hold-transition .content-wrapper {
754+
transition: none;
755+
}
751756
.control-sidebar-open .control-sidebar-bg,
752757
.control-sidebar-open .control-sidebar {
753758
right: 0;

dist/css/AdminLTE.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/alt/AdminLTE-without-plugins.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,11 @@ a:focus {
749749
.control-sidebar.control-sidebar-open + .control-sidebar-bg {
750750
right: 0;
751751
}
752+
.control-sidebar-hold-transition .control-sidebar-bg,
753+
.control-sidebar-hold-transition .control-sidebar,
754+
.control-sidebar-hold-transition .content-wrapper {
755+
transition: none;
756+
}
752757
.control-sidebar-open .control-sidebar-bg,
753758
.control-sidebar-open .control-sidebar {
754759
right: 0;

dist/css/alt/AdminLTE-without-plugins.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/adminlte.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ throw new Error('AdminLTE requires jQuery')
329329
var DataKey = 'lte.controlsidebar';
330330

331331
var Default = {
332-
slide: true
332+
controlsidebarSlide: true
333333
};
334334

335335
var Selector = {
@@ -343,7 +343,8 @@ throw new Error('AdminLTE requires jQuery')
343343
};
344344

345345
var ClassName = {
346-
open : 'control-sidebar-open',
346+
open: 'control-sidebar-open',
347+
transition: 'control-sidebar-hold-transition',
347348
fixed: 'fixed'
348349
};
349350

@@ -389,8 +390,11 @@ throw new Error('AdminLTE requires jQuery')
389390

390391
ControlSidebar.prototype.expand = function () {
391392
$(Selector.sidebar).show();
392-
if (!this.options.slide) {
393-
$('body').addClass(ClassName.open);
393+
if (!this.options.controlsidebarSlide) {
394+
$('body').addClass(ClassName.transition).addClass(ClassName.open).delay(50).queue(function(){
395+
$('body').removeClass(ClassName.transition);
396+
$(this).dequeue()
397+
})
394398
} else {
395399
$(Selector.sidebar).addClass(ClassName.open);
396400
}
@@ -400,7 +404,14 @@ throw new Error('AdminLTE requires jQuery')
400404
};
401405

402406
ControlSidebar.prototype.collapse = function () {
403-
$('body, ' + Selector.sidebar).removeClass(ClassName.open);
407+
if (!this.options.controlsidebarSlide) {
408+
$('body').addClass(ClassName.transition).removeClass(ClassName.open).delay(50).queue(function(){
409+
$('body').removeClass(ClassName.transition);
410+
$(this).dequeue()
411+
})
412+
} else {
413+
$(Selector.sidebar).removeClass(ClassName.open);
414+
}
404415
$(Selector.sidebar).fadeOut();
405416
$(this.element).trigger($.Event(Event.collapsed));
406417
};

dist/js/adminlte.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)