code reformat to follow the styles

This commit is contained in:
nixa 2016-04-29 17:27:19 +03:00
parent 669b3df4b5
commit a8cd300ecc
26 changed files with 193 additions and 187 deletions

View file

@ -6,34 +6,35 @@ import {SidebarService} from './sidebar.service';
import {SidebarStateService} from './sidebarState.service';
@Component({
selector: 'sidebar',
encapsulation: ViewEncapsulation.None,
styles: [ require('./sidebar.scss') ],
template: require('./sidebar.html'),
providers: [SidebarService],
directives: [],
pipes: []
selector: 'sidebar',
encapsulation: ViewEncapsulation.None,
styles: [require('./sidebar.scss')],
template: require('./sidebar.html'),
providers: [SidebarService],
directives: [],
pipes: []
})
export class Sidebar {
@Input('routes') routes;
menuItems: Array<any>;
menuHeight: number;
isMenuCollapsed: boolean;
menuItems:Array<any>;
menuHeight:number;
isMenuCollapsed:boolean;
showHoverElem: boolean;
hoverElemHeight: number;
hoverElemTop: number;
showHoverElem:boolean;
hoverElemHeight:number;
hoverElemTop:number;
outOfArea: number = -200;
outOfArea:number = -200;
isMenuShouldCollapsed: boolean = false;
isMenuShouldCollapsed:boolean = false;
constructor(private elementRef: ElementRef,
private router: Router,
private _sidebarService: SidebarService,
private _sidebarStateService: SidebarStateService) { }
constructor(private elementRef:ElementRef,
private router:Router,
private _sidebarService:SidebarService,
private _sidebarStateService:SidebarStateService) {
}
ngOnInit() {
this.menuItems = this._sidebarService.getMenuItems(this.routes);
@ -57,11 +58,11 @@ export class Sidebar {
this.updateSidebarHeight();
}
menuExpand () {
menuExpand() {
this.menuCollapseStateChange(false);
}
menuCollapse () {
menuCollapse() {
this.menuCollapseStateChange(true);
}
@ -70,9 +71,9 @@ export class Sidebar {
this._sidebarStateService.stateChanged(this.isMenuCollapsed);
}
hoverItem ($event) {
hoverItem($event) {
this.showHoverElem = true;
this.hoverElemHeight = $event.currentTarget.clientHeight;
this.hoverElemHeight = $event.currentTarget.clientHeight;
// TODO: get rid of magic 66 constant
this.hoverElemTop = $event.currentTarget.getBoundingClientRect().top - 66;
}
@ -82,7 +83,7 @@ export class Sidebar {
this.menuHeight = this.elementRef.nativeElement.childNodes[0].clientHeight - 84;
}
toggleSubMenu ($event, item) {
toggleSubMenu($event, item) {
var submenu = $($event.currentTarget).next();
if (this.isMenuCollapsed) {
@ -99,7 +100,7 @@ export class Sidebar {
}
private selectMenuItem() {
let isCurrent = (instruction) => (instruction ? this.router.isRouteActive(this.router.generate([instruction])): false);
let isCurrent = (instruction) => (instruction ? this.router.isRouteActive(this.router.generate([instruction])) : false);
this.menuItems.forEach(function (menu) {

View file

@ -7,22 +7,27 @@
<i class="{{ item.icon }}"></i><span>{{ item.title }}</span>
</a>
<a *ngIf="item.subMenu" (mouseenter)="hoverItem($event, item)" (click)="toggleSubMenu($event, item)" class="al-sidebar-list-link">
<a *ngIf="item.subMenu" (mouseenter)="hoverItem($event, item)" (click)="toggleSubMenu($event, item)"
class="al-sidebar-list-link">
<i class="{{ item.icon }}"></i><span>{{ item.title }}</span>
<b class="fa" [ngClass]="{'fa-angle-up': item.expanded, 'fa-angle-down': !item.expanded}" *ngIf="item.subMenu"></b>
<b class="fa" [ngClass]="{'fa-angle-up': item.expanded, 'fa-angle-down': !item.expanded}"
*ngIf="item.subMenu"></b>
</a>
<ul *ngIf="item.subMenu" class="al-sidebar-sublist"
[ngClass]="{expanded: item.expanded, 'slide-right': item.slideRight}">
<li *ngFor="#subitem of item.subMenu" [ngClass]="{'selected': subitem.selected, 'with-sub-menu': subitem.subMenu}">
<li *ngFor="#subitem of item.subMenu"
[ngClass]="{'selected': subitem.selected, 'with-sub-menu': subitem.subMenu}">
<a (mouseenter)="hoverItem($event, item)" *ngIf="subitem.subMenu" (click)="toggleSubMenu($event, subitem);"
class="al-sidebar-list-link subitem-submenu-link"><span>{{ subitem.title }}</span>
<b class="fa" *ngIf="subitem.subMenu" [ngClass]="{'fa-angle-up': subitem.expanded, 'fa-angle-down': !subitem.expanded}"></b>
<b class="fa" *ngIf="subitem.subMenu"
[ngClass]="{'fa-angle-up': subitem.expanded, 'fa-angle-down': !subitem.expanded}"></b>
</a>
<ul *ngIf="subitem.subMenu" class="al-sidebar-sublist subitem-submenu-list"
[ngClass]="{expanded: subitem.expanded, 'slide-right': subitem.slideRight}">
<li *ngFor="#subSubitem of subitem.subMenu" (mouseenter)="hoverItem($event, item)" [ngClass]="{selected: subitem.selected}">
<a (mouseenter)="hoverItem($event, item)" [routerLink]="[subSubitem.name]">
<li *ngFor="#subSubitem of subitem.subMenu" (mouseenter)="hoverItem($event, item)"
[ngClass]="{selected: subitem.selected}">
<a (mouseenter)="hoverItem($event, item)" [routerLink]="[subSubitem.name]">
{{ subSubitem.title }}</a>
</li>
</ul>

View file

@ -146,7 +146,7 @@ a.al-sidebar-list-link {
@include default-sublist();
}
.sidebar-hover-elem{
.sidebar-hover-elem {
width: 4px;
background: $primary;
position: absolute;

View file

@ -53,17 +53,18 @@ export class SidebarService {
}]
}
]
}];
}];
constructor() { }
constructor() {
}
getMenuItems(routes) {
let menuItems = routes.configs
.filter(function(s) {
.filter(function (s) {
return s.data.sidebarMeta != null;
})
.map(function(s) {
.map(function (s) {
var meta = s.data.sidebarMeta;
return {
title: s.data.title,
@ -73,10 +74,10 @@ export class SidebarService {
icon: meta.icon
};
})
.sort(function(a, b) {
.sort(function (a, b) {
return (a.level - b.level) * 100 + a.order - b.order;
})
.filter(function(item) {
.filter(function (item) {
return item.level == 0;
});

View file

@ -11,7 +11,7 @@ export class SidebarStateService {
isCollapsedStream$ = this._isCollapsed.asObservable();
// Service message commands
stateChanged(isCollapsed: boolean) {
stateChanged(isCollapsed:boolean) {
this._isCollapsed.next(isCollapsed)
}