expandable-admin-sidebar-section.component.ts (dspace-angular-dspace-7.0) | : | expandable-admin-sidebar-section.component.ts (dspace-angular-dspace-7.1) | ||
---|---|---|---|---|
skipping to change at line 12 | skipping to change at line 12 | |||
import { rotate } from '../../../shared/animations/rotate'; | import { rotate } from '../../../shared/animations/rotate'; | |||
import { AdminSidebarSectionComponent } from '../admin-sidebar-section/admin-sid ebar-section.component'; | import { AdminSidebarSectionComponent } from '../admin-sidebar-section/admin-sid ebar-section.component'; | |||
import { slide } from '../../../shared/animations/slide'; | import { slide } from '../../../shared/animations/slide'; | |||
import { CSSVariableService } from '../../../shared/sass-helper/sass-helper.serv ice'; | import { CSSVariableService } from '../../../shared/sass-helper/sass-helper.serv ice'; | |||
import { bgColor } from '../../../shared/animations/bgColor'; | import { bgColor } from '../../../shared/animations/bgColor'; | |||
import { MenuID } from '../../../shared/menu/initial-menus-state'; | import { MenuID } from '../../../shared/menu/initial-menus-state'; | |||
import { MenuService } from '../../../shared/menu/menu.service'; | import { MenuService } from '../../../shared/menu/menu.service'; | |||
import { combineLatest as combineLatestObservable, Observable } from 'rxjs'; | import { combineLatest as combineLatestObservable, Observable } from 'rxjs'; | |||
import { map } from 'rxjs/operators'; | import { map } from 'rxjs/operators'; | |||
import { rendersSectionForMenu } from '../../../shared/menu/menu-section.decorat or'; | import { rendersSectionForMenu } from '../../../shared/menu/menu-section.decorat or'; | |||
import { Router } from '@angular/router'; | ||||
/** | /** | |||
* Represents a expandable section in the sidebar | * Represents a expandable section in the sidebar | |||
*/ | */ | |||
@Component({ | @Component({ | |||
selector: 'ds-expandable-admin-sidebar-section', | /* tslint:disable:component-selector */ | |||
selector: 'li[ds-expandable-admin-sidebar-section]', | ||||
templateUrl: './expandable-admin-sidebar-section.component.html', | templateUrl: './expandable-admin-sidebar-section.component.html', | |||
styleUrls: ['./expandable-admin-sidebar-section.component.scss'], | styleUrls: ['./expandable-admin-sidebar-section.component.scss'], | |||
animations: [rotate, slide, bgColor] | animations: [rotate, slide, bgColor] | |||
}) | }) | |||
@rendersSectionForMenu(MenuID.ADMIN, true) | @rendersSectionForMenu(MenuID.ADMIN, true) | |||
export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionC omponent implements OnInit { | export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionC omponent implements OnInit { | |||
/** | /** | |||
* This section resides in the Admin Sidebar | * This section resides in the Admin Sidebar | |||
*/ | */ | |||
skipping to change at line 51 | skipping to change at line 53 | |||
* Emits true when the sidebar's preview is currently collapsed, true when it' s expanded | * Emits true when the sidebar's preview is currently collapsed, true when it' s expanded | |||
*/ | */ | |||
sidebarPreviewCollapsed: Observable<boolean>; | sidebarPreviewCollapsed: Observable<boolean>; | |||
/** | /** | |||
* Emits true when the menu section is expanded, else emits false | * Emits true when the menu section is expanded, else emits false | |||
* This is true when the section is active AND either the sidebar or it's prev iew is open | * This is true when the section is active AND either the sidebar or it's prev iew is open | |||
*/ | */ | |||
expanded: Observable<boolean>; | expanded: Observable<boolean>; | |||
constructor(@Inject('sectionDataProvider') menuSection, protected menuService: | constructor( | |||
MenuService, | @Inject('sectionDataProvider') menuSection, | |||
private variableService: CSSVariableService, protected injector: I | protected menuService: MenuService, | |||
njector) { | private variableService: CSSVariableService, | |||
super(menuSection, menuService, injector); | protected injector: Injector, | |||
protected router: Router, | ||||
) { | ||||
super(menuSection, menuService, injector, router); | ||||
} | } | |||
/** | /** | |||
* Set initial values for instance variables | * Set initial values for instance variables | |||
*/ | */ | |||
ngOnInit(): void { | ngOnInit(): void { | |||
super.ngOnInit(); | super.ngOnInit(); | |||
this.sidebarActiveBg = this.variableService.getVariable('adminSidebarActiveB g'); | this.sidebarActiveBg = this.variableService.getVariable('adminSidebarActiveB g'); | |||
this.sidebarCollapsed = this.menuService.isMenuCollapsed(this.menuID); | this.sidebarCollapsed = this.menuService.isMenuCollapsed(this.menuID); | |||
this.sidebarPreviewCollapsed = this.menuService.isMenuPreviewCollapsed(this. menuID); | this.sidebarPreviewCollapsed = this.menuService.isMenuPreviewCollapsed(this. menuID); | |||
End of changes. 3 change blocks. | ||||
6 lines changed or deleted | 11 lines changed or added |