Merge branch 'master' into skeleton

This commit is contained in:
Sercan Yemen 2018-08-28 08:39:08 +03:00
commit 4a4220c123

View File

@ -16,7 +16,7 @@ export class FuseMatSidenavHelperDirective implements OnInit, OnDestroy
isLockedOpen: boolean; isLockedOpen: boolean;
@Input() @Input()
id: string; fuseMatSidenavHelper: string;
@Input() @Input()
matIsLockedOpen: string; matIsLockedOpen: string;
@ -56,7 +56,7 @@ export class FuseMatSidenavHelperDirective implements OnInit, OnDestroy
ngOnInit(): void ngOnInit(): void
{ {
// Register the sidenav to the service // Register the sidenav to the service
this._fuseMatSidenavHelperService.setSidenav(this.id, this._matSidenav); this._fuseMatSidenavHelperService.setSidenav(this.fuseMatSidenavHelper, this._matSidenav);
if ( this._observableMedia.isActive(this.matIsLockedOpen) ) if ( this._observableMedia.isActive(this.matIsLockedOpen) )
{ {
@ -106,7 +106,7 @@ export class FuseMatSidenavHelperDirective implements OnInit, OnDestroy
export class FuseMatSidenavTogglerDirective export class FuseMatSidenavTogglerDirective
{ {
@Input() @Input()
id: string; fuseMatSidenavToggler: string;
/** /**
* Constructor * Constructor
@ -128,6 +128,6 @@ export class FuseMatSidenavTogglerDirective
@HostListener('click') @HostListener('click')
onClick(): void onClick(): void
{ {
this._fuseMatSidenavHelperService.getSidenav(this.id).toggle(); this._fuseMatSidenavHelperService.getSidenav(this.fuseMatSidenavToggler).toggle();
} }
} }