inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-2626] small changes on logic based on pr comments

Browse Source
This commit is contained in:
georgiana-roman
2018-05-09 09:42:32 +03:00
parent 6893db0530
commit 448dccf9b9
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo-shell/src/app/components/app-layout/app-layout.component.html
View File

@@ -1,4 +1,4 @@
<adf-sidenav-layout [sidenavMin]="70" [sidenavMax]="220" [stepOver]="780" [hideSidenav]="false"[expandedSidenav]= "expandedSidenav" (notify)='setState($event)'> <adf-sidenav-layout [sidenavMin]="70" [sidenavMax]="220" [stepOver]="780" [hideSidenav]="false"[expandedSidenav]= "expandedSidenav" (expanded)="setState($event)">
<adf-sidenav-layout-header> <adf-sidenav-layout-header>
<ng-template let-toggleMenu="toggleMenu"> <ng-template let-toggleMenu="toggleMenu">

4
demo-shell/src/app/components/app-layout/app-layout.component.ts
View File

@@ -50,7 +50,7 @@ export class AppLayoutComponent implements OnInit {
{ href: '/about', icon: 'info_outline', title: 'APP_LAYOUT.ABOUT' } { href: '/about', icon: 'info_outline', title: 'APP_LAYOUT.ABOUT' }
]; ];
expandedSidenav: Boolean = false; expandedSidenav = false;
ngOnInit() { ngOnInit() {
@@ -68,7 +68,7 @@ export class AppLayoutComponent implements OnInit {
setState(state) { setState(state) {
if (this.config.get('sideNav.preserveState')) { if (this.config.get('sideNav.preserveState')) {
this.userpreference.set('expendedSidenav', state); this.userpreference.set('expandedSidenav', state);
} }
} }
} }

6
lib/core/sidenav-layout/components/sidenav-layout/sidenav-layout.component.ts
View File

@@ -38,7 +38,7 @@ export class SidenavLayoutComponent implements OnInit, AfterViewInit, OnDestroy
@Input() hideSidenav = false; @Input() hideSidenav = false;
@Input() expandedSidenav = true; @Input() expandedSidenav = true;
@Output() notify = new EventEmitter(); @Output() expanded = new EventEmitter<boolean>();
@ContentChild(SidenavLayoutHeaderDirective) headerDirective: SidenavLayoutHeaderDirective; @ContentChild(SidenavLayoutHeaderDirective) headerDirective: SidenavLayoutHeaderDirective;
@ContentChild(SidenavLayoutNavigationDirective) navigationDirective: SidenavLayoutNavigationDirective; @ContentChild(SidenavLayoutNavigationDirective) navigationDirective: SidenavLayoutNavigationDirective;
@@ -84,7 +84,7 @@ export class SidenavLayoutComponent implements OnInit, AfterViewInit, OnDestroy
this.mediaQueryList.removeListener(this.onMediaQueryChange); this.mediaQueryList.removeListener(this.onMediaQueryChange);
} }
toggleMenu(expandedSidenav) { toggleMenu() {
if (!this.mediaQueryList.matches) { if (!this.mediaQueryList.matches) {
this.isMenuMinimized = !this.isMenuMinimized; this.isMenuMinimized = !this.isMenuMinimized;
} else { } else {
@@ -92,7 +92,7 @@ export class SidenavLayoutComponent implements OnInit, AfterViewInit, OnDestroy
} }
this.container.toggleMenu(); this.container.toggleMenu();
this.notify.emit((!this.isMenuMinimized).toString()); this.expanded.emit(!this.isMenuMinimized);
} }
get isMenuMinimized() { get isMenuMinimized() {