Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-17 16:00:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop/router'

Browse source 
Conflicts:
	src/platform/browser/directives.ts
	src/platform/browser/providers.ts
This commit is contained in:
nixa 2016-07-12 10:37:24 +03:00
commit 660aa8a4b6
33 changed files with 616 additions and 550 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/platform/browser/providers.ts
View file

@ -7,8 +7,8 @@ import {FORM_PROVIDERS, LocationStrategy, HashLocationStrategy} from '@angular/c
// Angular 2 Http
import {HTTP_PROVIDERS} from '@angular/http';
// Angular 2 Router
import {ROUTER_PROVIDERS} from '@angular/router-deprecated';
import {APP_ROUTER_PROVIDERS} from '../../app/app.routes';
// Angular 2 forms
import {disableDeprecatedForms, provideForms} from '@angular/forms';
@ -22,8 +22,9 @@ export const APPLICATION_PROVIDERS = [
disableDeprecatedForms(),
provideForms(),
...HTTP_PROVIDERS,
...ROUTER_PROVIDERS,
...APP_ROUTER_PROVIDERS,
{provide: LocationStrategy, useClass: HashLocationStrategy}
{provide: LocationStrategy, useClass: HashLocationStrategy }
];
export const PROVIDERS = [