Merge branch 'resolvers-branch-angular6' into w2p-57053_menu-angular6

Conflicts:
	src/app/app.module.ts
	src/app/header/header.component.ts
	src/app/navbar/navbar.effects.ts
This commit is contained in:
lotte
2018-11-12 09:49:26 +01:00
230 changed files with 6657 additions and 7197 deletions

View File

@@ -1,5 +1,6 @@
import { map } from 'rxjs/operators';
import { Injectable } from '@angular/core';
import { Effect, Actions } from '@ngrx/effects'
import { Effect, Actions, ofType } from '@ngrx/effects'
import * as fromRouter from '@ngrx/router-store';
import { HostWindowActionTypes } from '../shared/host-window.actions';
@@ -9,12 +10,16 @@ import { NavbarCollapseAction } from './navbar.actions';
export class NavbarEffects {
@Effect() resize$ = this.actions$
.ofType(HostWindowActionTypes.RESIZE)
.map(() => new NavbarCollapseAction());
.pipe(
ofType(HostWindowActionTypes.RESIZE),
map(() => new NavbarCollapseAction())
);
@Effect() routeChange$ = this.actions$
.ofType(fromRouter.ROUTER_NAVIGATION)
.map(() => new NavbarCollapseAction());
.pipe(
ofType(fromRouter.ROUTER_NAVIGATION),
map(() => new NavbarCollapseAction())
);
constructor(private actions$: Actions) {