From 24687102cf341b937d5ef9bd96f87a0235b09b12 Mon Sep 17 00:00:00 2001 From: Alexander Zhukov Date: Wed, 1 Feb 2017 14:48:24 +0300 Subject: [PATCH] fix(menu): fix inactive menu item --- src/app/app.component.ts | 9 --------- src/app/pages/pages.component.ts | 10 ++++++++-- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index de8d487d6b..60f6c471bc 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,13 +1,8 @@ -import { Routes } from '@angular/router'; import { Component, ViewContainerRef } from '@angular/core'; import { GlobalState } from './global.state'; import { BaImageLoaderService, BaThemePreloader, BaThemeSpinner } from './theme/services'; import { layoutPaths } from './theme/theme.constants'; -import { BaThemeConfig } from './theme/theme.config'; -import { BaMenuService } from './theme'; - -import { MENU } from './app.menu'; import 'style-loader!./app.scss'; import 'style-loader!./theme/initial.scss'; @@ -32,12 +27,8 @@ export class App { constructor(private _state: GlobalState, private _imageLoader: BaImageLoaderService, private _spinner: BaThemeSpinner, - private _config: BaThemeConfig, - private _menuService: BaMenuService, private viewContainerRef: ViewContainerRef) { - this._menuService.updateMenuByRoutes(MENU); - this._loadImages(); this._state.subscribe('menu.isCollapsed', (isCollapsed) => { diff --git a/src/app/pages/pages.component.ts b/src/app/pages/pages.component.ts index 382ce5ebcd..adf10e3ac6 100644 --- a/src/app/pages/pages.component.ts +++ b/src/app/pages/pages.component.ts @@ -1,4 +1,9 @@ -import {Component} from '@angular/core'; +import { Component } from '@angular/core'; +import { Routes } from '@angular/router'; + +import { BaMenuService } from '../theme'; +import { MENU } from '../app.menu'; + @Component({ selector: 'pages', styles: [], @@ -28,9 +33,10 @@ import {Component} from '@angular/core'; }) export class Pages { - constructor() { + constructor(private _menuService: BaMenuService,) { } ngOnInit() { + this._menuService.updateMenuByRoutes(MENU); } }