Merge branch 'master' into skeleton

This commit is contained in:
Sercan Yemen 2017-11-30 10:23:19 +03:00
commit b81638690e
2 changed files with 3 additions and 3 deletions

View File

@ -54,7 +54,7 @@ export class FusePerfectScrollbarDirective implements OnInit, AfterViewInit, OnD
ngOnDestroy() ngOnDestroy()
{ {
if ( !this.isInitialized ) if ( !this.isInitialized || !this.ps )
{ {
return; return;
} }

View File

@ -42,8 +42,8 @@
fuse-footer, fuse-footer,
fuse-quick-panel, fuse-quick-panel,
fuse-theme-options, fuse-theme-options,
.ps > .ps__scrollbar-x-rail, .ps > .ps__rail-x,
.ps > .ps__scrollbar-y-rail { .ps > .ps__rail-y {
display: none !important; display: none !important;
} }