cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(tslint): update tslint to 4.x (#13603)

Browse Source
This commit is contained in:
Victor Berchet
2016-12-27 14:55:58 -08:00
committed by Hans
parent e5c4e5801f
commit eed83443b8
50 changed files with 2599 additions and 5467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
modules/@angular/router/src/router_state.ts
View File

@ -159,39 +159,37 @@ export type Inherited = {
params: Params,
data: Data,
resolve: Data,
}
};
/** @internal */
export function
inheritedParamsDataResolve(route: ActivatedRouteSnapshot):
Inherited {
const pathToRoot = route.pathFromRoot;
export function inheritedParamsDataResolve(route: ActivatedRouteSnapshot): Inherited {
const pathToRoot = route.pathFromRoot;
let inhertingStartingFrom = pathToRoot.length - 1;
let inhertingStartingFrom = pathToRoot.length - 1;
while (inhertingStartingFrom >= 1) {
const current = pathToRoot[inhertingStartingFrom];
const parent = pathToRoot[inhertingStartingFrom - 1];
// current route is an empty path => inherits its parent's params and data
if (current.routeConfig && current.routeConfig.path === '') {
inhertingStartingFrom--;
while (inhertingStartingFrom >= 1) {
const current = pathToRoot[inhertingStartingFrom];
const parent = pathToRoot[inhertingStartingFrom - 1];
// current route is an empty path => inherits its parent's params and data
if (current.routeConfig && current.routeConfig.path === '') {
inhertingStartingFrom--;
// parent is componentless => current route should inherit its params and data
} else if (!parent.component) {
inhertingStartingFrom--;
// parent is componentless => current route should inherit its params and data
} else if (!parent.component) {
inhertingStartingFrom--;
} else {
break;
}
}
return pathToRoot.slice(inhertingStartingFrom).reduce((res, curr) => {
const params = merge(res.params, curr.params);
const data = merge(res.data, curr.data);
const resolve = merge(res.resolve, curr._resolvedData);
return {params, data, resolve};
}, <any>{params: {}, data: {}, resolve: {}});
} else {
break;
}
}
return pathToRoot.slice(inhertingStartingFrom).reduce((res, curr) => {
const params = merge(res.params, curr.params);
const data = merge(res.data, curr.data);
const resolve = merge(res.resolve, curr._resolvedData);
return {params, data, resolve};
}, <any>{params: {}, data: {}, resolve: {}});
}
/**
* @whatItDoes Contains the information about a route associated with a component loaded in an

6
modules/@angular/router/testing/private_import_router.ts
View File

@ -8,6 +8,6 @@
import {__router_private__ as _} from '@angular/router';
export var ROUTER_PROVIDERS: typeof _.ROUTER_PROVIDERS = _.ROUTER_PROVIDERS;
export var ROUTES: typeof _.ROUTES = _.ROUTES;
export var flatten: typeof _.flatten = _.flatten;
export const ROUTER_PROVIDERS: typeof _.ROUTER_PROVIDERS = _.ROUTER_PROVIDERS;
export const ROUTES: typeof _.ROUTES = _.ROUTES;
export const flatten: typeof _.flatten = _.flatten;