angular-docs-cn/aio/content/guide/router.md

# Routing and navigation

# 路由与导航

The Angular **`Router`** enables navigation from one [view](guide/glossary#view) to the next
as users perform application tasks.

在用户使用应用程序时，Angular 的***路由器***能让用户从一个[视图](guide/glossary#view)导航到另一个视图。

This guide covers the router's primary features, illustrating them through the evolution
of a small application that you can <live-example>run live in the browser</live-example>.

本章涵盖了该路由器的主要特性，通过一个小型应用的成长演进来讲解它。参见<live-example></live-example>。

<!-- style for all tables on this page -->

<style>
  td, th {vertical-align: top}
</style>

## Overview

## 概览

The browser is a familiar model of application navigation:

浏览器具有熟悉的导航模式：

* Enter a URL in the address bar and the browser navigates to a corresponding page.

   在地址栏输入 URL，浏览器就会导航到相应的页面。

* Click links on the page and the browser navigates to a new page.

   在页面中点击链接，浏览器就会导航到一个新页面。

* Click the browser's back and forward buttons and the browser navigates
  backward and forward through the history of pages you've seen.

   点击浏览器的前进和后退按钮，浏览器就会在你的浏览历史中向前或向后导航。

The Angular `Router` ("the router") borrows from this model.
It can interpret a browser URL as an instruction to navigate to a client-generated view.
It can pass optional parameters along to the supporting view component that help it decide what specific content to present.
You can bind the router to links on a page and it will navigate to
the appropriate application view when the user clicks a link.
You can navigate imperatively when the user clicks a button, selects from a drop box,
or in response to some other stimulus from any source. And the router logs activity
in the browser's history journal so the back and forward buttons work as well.

Angular 的 `Router`（即“路由器”）借鉴了这个模型。它把浏览器中的 URL 看做一个操作指南，
  据此导航到一个由客户端生成的视图，并可以把参数传给支撑视图的相应组件，帮它决定具体该展现哪些内容。
  你可以为页面中的链接绑定一个路由，这样，当用户点击链接时，就会导航到应用中相应的视图。
  当用户点击按钮、从下拉框中选取，或响应来自任何地方的事件时，你也可以在代码控制下进行导航。
  路由器还在浏览器的历史日志中记录下这些活动，这样浏览器的前进和后退按钮也能照常工作。

{@a basics}

## The Basics

## 基础知识

This guide proceeds in phases, marked by milestones, starting from a simple two-pager
and building toward a modular, multi-view design with child routes.

本章包括一系列里程碑，从一个单模块、两个页面的简单程序逐步走向带有多个子路由的多视图设计。

An introduction to a few core router concepts will help orient you to the details that follow.

先对路由的一些核心概念做一个介绍，它能帮你逐步过渡到细节。

{@a basics-base-href}

### *&lt;base href>*

### *&lt;base href>* 元素

Most routing applications should add a `<base>` element to the `index.html` as the first child in the  `<head>` tag
to tell the router how to compose navigation URLs.

大多数带路由的应用都要在**`index.html`**的 `<head>` 标签下先添加一个 `<base>` 元素，来告诉路由器该如何合成导航用的 URL。

If the `app` folder is the application root, as it is for the sample application,
set the `href` value *exactly* as shown here.

如果 `app` 文件夹是该应用的根目录（就像范例应用中一样），那就把 `href` 的值设置为下面这样：

<code-example path="router/src/index.html" header="src/index.html (base-href)" region="base-href"></code-example>

{@a basics-router-imports}

### Router imports

### 从路由库中导入

The Angular Router is an optional service that presents a particular component view for a given URL.
It is not part of the Angular core. It is in its own library package, `@angular/router`.
Import what you need from it as you would from any other Angular package.

Angular 的路由器是一个可选的服务，它用来呈现指定的 URL 所对应的视图。
它并不是 Angular 核心库的一部分，而是在它自己的 `@angular/router` 包中。
像其它 Angular 包一样，你可以从它导入所需的一切。

<code-example path="router/src/app/app.module.1.ts" header="src/app/app.module.ts (import)" region="import-router"></code-example>

<div class="alert is-helpful">

You'll learn about more options in the [details below](#browser-url-styles).

你将会在[后面](guide/router#browser-url-styles)学到更多选项。

</div>

{@a basics-config}

### Configuration

### 配置

A routed Angular application has one singleton instance of the *`Router`* service.
When the browser's URL changes, that router looks for a corresponding `Route`
from which it can determine the component to display.

每个带路由的 Angular 应用都有一个*`Router`（路由器）*服务的单例对象。
当浏览器的 URL 变化时，路由器会查找对应的 `Route`（路由），并据此决定该显示哪个组件。

A router has no routes until you configure it.
The following example creates five route definitions, configures the router via the `RouterModule.forRoot()` method,
and adds the result to the `AppModule`'s `imports` array.

路由器需要先配置才会有路由信息。
下面的例子创建了五个路由定义，并用 `RouterModule.forRoot()` 方法来配置路由器，
并把它的返回值添加到 `AppModule` 的 `imports` 数组中。

<code-example path="router/src/app/app.module.0.ts" header="src/app/app.module.ts (excerpt)"></code-example>

{@a example-config}

The `appRoutes` array of *routes* describes how to navigate.
Pass it to the `RouterModule.forRoot()` method in the module `imports` to configure the router.

这里的路由数组 `appRoutes` 描述如何进行导航。
把它传给 `RouterModule.forRoot()` 方法并传给本模块的 `imports` 数组就可以配置路由器。

Each `Route` maps a URL `path` to a component.
There are _no leading slashes_ in the _path_.
The router parses and builds the final URL for you,
allowing you to use both relative and absolute paths when navigating between application views.

每个 `Route` 都会把一个 URL 的 `path` 映射到一个组件。
注意，`path` 不能以*斜杠（`/`）*开头。
路由器会为解析和构建最终的 URL，这样当你在应用的多个视图之间导航时，可以任意使用相对路径和绝对路径。

The `:id` in the second route is a token for a route parameter. In a URL such as `/hero/42`, "42"
is the value of the `id` parameter. The corresponding `HeroDetailComponent`
will use that value to find and present the hero whose `id` is 42.
You'll learn more about route parameters later in this guide.

第二个路由中的 `:id` 是一个路由参数的令牌(Token)。比如 `/hero/42` 这个 URL 中，“42”就是 `id` 参数的值。
此 URL 对应的 `HeroDetailComponent` 组件将据此查找和展现 `id` 为 42 的英雄。
在本章中稍后的部分，你将会学习关于路由参数的更多知识。

The `data` property in the third route is a place to store arbitrary data associated with
this specific route. The data property is accessible within each activated route. Use it to store
items such as page titles, breadcrumb text, and other read-only, _static_ data.
You'll use the [resolve guard](#resolve-guard) to retrieve _dynamic_ data later in the guide.

第三个路由中的 `data` 属性用来存放于每个具体路由有关的任意信息。该数据可以被任何一个激活路由访问，并能用来保存诸如
页标题、面包屑以及其它静态只读数据。本章稍后的部分，你将使用[resolve 守卫](guide/router#resolve-guard)来获取动态数据。

The **empty path** in the fourth route represents the default path for the application,
the place to go when the path in the URL is empty, as it typically is at the start.
This default route redirects to the route for the `/heroes` URL and, therefore, will display the `HeroesListComponent`.

第四个路由中的空路径（`''`）表示应用的默认路径，当 URL 为空时就会访问那里，因此它通常会作为起点。
这个默认路由会重定向到 URL `/heroes`，并显示 `HeroesListComponent`。

The `**` path in the last route is a **wildcard**. The router will select this route
if the requested URL doesn't match any paths for routes defined earlier in the configuration.
This is useful for displaying a "404 - Not Found" page or redirecting to another route.

最后一个路由中的 `**` 路径是一个**通配符**。当所请求的 URL 不匹配前面定义的路由表中的任何路径时，路由器就会选择此路由。
这个特性可用于显示“404 - Not Found”页，或自动重定向到其它路由。

**The order of the routes in the configuration matters** and this is by design. The router uses a **first-match wins**
strategy when matching routes, so more specific routes should be placed above less specific routes.
In the configuration above, routes with a static path are listed first, followed by an empty path route,
that matches the default route.
The wildcard route comes last because it matches _every URL_ and should be selected _only_ if no other routes are matched first.

**这些路由的定义顺序**是刻意如此设计的。路由器使用**先匹配者优先**的策略来匹配路由，所以，具体路由应该放在通用路由的前面。在上面的配置中，带静态路径的路由被放在了前面，后面是空路径路由，因此它会作为默认路由。而通配符路由被放在最后面，这是因为它能匹配上*每一个 URL*，因此应该**只有在**前面找不到其它能匹配的路由时才匹配它。

If you need to see what events are happening during the navigation lifecycle, there is the **enableTracing** option as part of the router's default configuration. This outputs each router event that took place during each navigation lifecycle to the browser console. This should only be used for _debugging_ purposes. You set the `enableTracing: true` option in the object passed as the second argument to the `RouterModule.forRoot()` method.

如果你想要看到在导航的生命周期中发生过哪些事件，可以使用路由器默认配置中的 **enableTracing** 选项。它会把每个导航生命周期中的事件输出到浏览器的控制台。
这应该只用于*调试*。你只需要把 `enableTracing: true` 选项作为第二个参数传给 `RouterModule.forRoot()` 方法就可以了。

{@a basics-router-outlet}

### Router outlet

### 路由出口

The `RouterOutlet` is a directive from the router library that is used like a component.
It acts as a placeholder that marks the spot in the template where the router should
display the components for that outlet.

`RouterOutlet` 是一个来自路由模块中的指令，它的用法类似于组件。
它扮演一个占位符的角色，用于在模板中标出一个位置，路由器将会把要显示在这个出口处的组件显示在这里。

<code-example language="html">
  &lt;router-outlet>&lt;/router-outlet>
  &lt;!-- Routed components go here -->

</code-example>

Given the configuration above, when the browser URL for this application becomes `/heroes`,
the router matches that URL to the route path `/heroes` and displays the `HeroListComponent`
as a sibling element to the `RouterOutlet` that you've placed in the host component's template.

有了这份配置，当本应用在浏览器中的 URL 变为 `/heroes` 时，路由器就会匹配到 `path` 为 `heroes` 的 `Route`，并在宿主视图中的*`RouterOutlet`*之后显示 `HeroListComponent` 组件。

{@a basics-router-links}
{@a router-link}

### Router links

### 路由器链接

Now you have routes configured and a place to render them, but
how do you navigate? The URL could arrive directly from the browser address bar.
But most of the time you navigate as a result of some user action such as the click of
an anchor tag.

现在，你已经有了配置好的一些路由，还找到了渲染它们的地方，但又该如何导航到它呢？固然，从浏览器的地址栏直接输入 URL 也能做到，但是大多数情况下，导航是某些用户操作的结果，比如点击一个 A 标签。

Consider the following template:

考虑下列模板：

<code-example path="router/src/app/app.component.1.html" header="src/app/app.component.html"></code-example>

The `RouterLink` directives on the anchor tags give the router control over those elements.
The navigation paths are fixed, so you can assign a string to the `routerLink` (a "one-time" binding).

`a` 标签上的 `RouterLink` 指令让路由器得以控制这个 `a` 元素。
这里的导航路径是固定的，因此可以把一个字符串赋给 `routerLink`（“一次性”绑定）。

Had the navigation path been more dynamic, you could have bound to a template expression that
returned an array of route link parameters (the _link parameters array_).
The router resolves that array into a complete URL.

如果需要更加动态的导航路径，那就把它绑定到一个返回*链接参数数组*的模板表达式。
路由器会把这个数组解析成完整的 URL。

{@a router-link-active}


### Active router links

### 路由链接的激活状态

The `RouterLinkActive` directive toggles css classes for active `RouterLink` bindings based on the current `RouterState`.

`RouterLinkActive` 指令会基于当前的 `RouterState` 为活动的 `RouterLink` 切换所绑定的 css 类。

On each anchor tag, you see a [property binding](guide/template-syntax#property-binding) to the `RouterLinkActive` directive that look like `routerLinkActive="..."`.

在每个 A 标签上，你会看到一个到 `RouterLinkActive` 的[属性绑定](guide/template-syntax#property-binding)，形如 `routerLinkActive="..."`。

The template expression to the right of the equals (=) contains a space-delimited string of CSS classes
that the Router will add when this link is active (and remove when the link is inactive). You set the `RouterLinkActive`
directive to a string of classes such as `[routerLinkActive]="'active fluffy'"` or bind it to a component
property that returns such a string.

等号右边的模板表达式包含一些用空格分隔的 CSS 类名，当这个链接激活时，路由器将会把它们加上去（并在处于非活动状态时移除）。你还可以把 `RouterLinkActive` 设置为一个类组成的字符串，如 `[routerLinkActive]="'active fluffy'"`，或把它绑定到一个返回类似字符串的组件属性。

Active route links cascade down through each level of the route tree, so parent and child router links can be active at the same time. To override this behavior, you can bind to the `[routerLinkActiveOptions]` input binding with the `{ exact: true }` expression. By using `{ exact: true }`, a given `RouterLink` will only be active if its URL is an exact match to the current URL.

路由链接的激活状态会向下级联到路由树中的每个层级，所以，父子路由链接可能会同时激活。要覆盖这种行为，可以把 `[routerLinkActiveOptions]` 绑定为 `{ exact: true }` 表达式，这样 `RouterLink` 只有当 URL 与当前 URL 精确匹配时才会激活。

{@a basics-router-state}

### Router state

### 路由器状态

After the end of each successful navigation lifecycle, the router builds a tree of `ActivatedRoute` objects
that make up the current state of the router. You can access the current `RouterState` from anywhere in the
application using the `Router` service and the `routerState` property.

在导航时的每个生命周期成功完成时，路由器会构建出一个 `ActivatedRoute` 组成的树，它表示路由器的当前状态。
你可以在应用中的任何地方用 `Router` 服务及其 `routerState` 属性来访问当前的 `RouterState` 值。

Each `ActivatedRoute` in the `RouterState` provides methods to traverse up and down the route tree
to get information from parent, child and sibling routes.

`RouterState` 中的每个 `ActivatedRoute` 都提供了从任意激活路由开始向上或向下遍历路由树的一种方式，以获得关于父、子、兄弟路由的信息。

{@a activated-route}

### Activated route

### 激活的路由

The route path and parameters are available through an injected router service called the
[ActivatedRoute](api/router/ActivatedRoute).
It has a great deal of useful information including:

该路由的路径和参数可以通过注入进来的一个名叫[ActivatedRoute](api/router/ActivatedRoute)的路由服务来获取。
它有一大堆有用的信息，包括：

<table>
  <tr>

    <th>

      Property

      属性

    </th>

    <th>

      Description

      说明

    </th>

  </tr>

  <tr>

    <td>

      <code>url</code>

    </td>

    <td>

    An `Observable` of the route path(s), represented as an array of strings for each part of the route path.

    路由路径的 `Observable` 对象，是一个由路由路径中的各个部分组成的字符串数组。

    </td>

  </tr>

  <tr>

    <td>

      <code>data</code>

    </td>

    <td>

    An `Observable` that contains the `data` object provided for the route. Also contains any resolved values from the [resolve guard](#resolve-guard).

    一个 `Observable`，其中包含提供给路由的 `data` 对象。也包含由[解析守卫（resolve guard）](#resolve-guard)解析而来的值。

    </td>

  </tr>

  <tr>

    <td>

      <code>paramMap</code>

    </td>

    <td>

    An `Observable` that contains a [map](api/router/ParamMap) of the required and [optional parameters](#optional-route-parameters) specific to the route. The map supports retrieving single and multiple values from the same parameter.

    一个 `Observable`，其中包含一个由当前路由的必要参数和[可选参数](#optional-route-parameters)组成的[map](api/router/ParamMap)对象。用这个 map 可以获取来自同名参数的单一值或多重值。

    </td>

  </tr>

  <tr>

    <td>

      <code>queryParamMap</code>

    </td>

    <td>

    An `Observable` that contains a [map](api/router/ParamMap) of the [query parameters](#query-parameters) available to all routes.
    The map supports retrieving single and multiple values from the query parameter.

    一个 `Observable`，其中包含一个对所有路由都有效的[查询参数](#query-parameters)组成的[map](api/router/ParamMap)对象。
    用这个 map 可以获取来自查询参数的单一值或多重值。

    </td>

  </tr>

  <tr>

    <td>

      <code>fragment</code>

    </td>

    <td>

    An `Observable` of the URL [fragment](#fragment) available to all routes.

    一个适用于所有路由的 URL 的 [fragment（片段）](#fragment)的 `Observable`。

    </td>

  </tr>

  <tr>

    <td>

      <code>outlet</code>

    </td>

    <td>

    The name of the `RouterOutlet` used to render the route. For an unnamed outlet, the outlet name is _primary_.

    要把该路由渲染到的 `RouterOutlet` 的名字。对于无名路由，它的路由名是 `primary`，而不是空串。

    </td>

  </tr>

  <tr>

    <td>

      <code>routeConfig</code>

    </td>

    <td>

    The route configuration used for the route that contains the origin path.

    用于该路由的路由配置信息，其中包含原始路径。

    </td>

  </tr>

    <tr>

    <td>

      <code>parent</code>

    </td>

    <td>

    The route's parent `ActivatedRoute` when this route is a [child route](#child-routing-component).

    当该路由是一个[子路由](#child-routing-component)时，表示该路由的父级 `ActivatedRoute`。

    </td>

  </tr>

  <tr>

    <td>

      <code>firstChild</code>

    </td>

    <td>

    Contains the first `ActivatedRoute` in the list of this route's child routes.

    包含该路由的子路由列表中的第一个 `ActivatedRoute`。

    </td>

  </tr>

  <tr>

    <td>

      <code>children</code>

    </td>

    <td>

    Contains all the [child routes](#child-routing-component) activated under the current route.

    包含当前路由下所有已激活的[子路由](#child-routing-component)。

    </td>

  </tr>
</table>

<div class="alert is-helpful">

Two older properties are still available. They are less capable than their replacements, discouraged, and may be deprecated in a future Angular version.

有两个旧式属性仍然是有效的，但它们不如其替代品那样强力，建议不再用它们，它们还将在未来的 Angular 版本中废弃。

**`params`**&mdash;An `Observable` that contains the required and [optional parameters](#optional-route-parameters) specific to the route. Use `paramMap` instead.

**`params`** —— 一个 `Observable` 对象，其中包含当前路由的必要参数和[可选参数](#optional-route-parameters)。请改用 `paramMap`。

**`queryParams`**&mdash;An `Observable` that contains the [query parameters](#query-parameters) available to all routes.
Use `queryParamMap` instead.

**`queryParams`** —— 一个 `Observable` 对象，其中包含对所有路由都有效的[查询参数](#query-parameters)。请改用 `queryParamMap`。

</div>

### Router events

### 路由事件

During each navigation, the `Router` emits navigation events through the `Router.events` property. These events range from when the navigation starts and ends to many points in between. The full list of navigation events is displayed in the table below.

在每次导航中，`Router` 都会通过 `Router.events` 属性发布一些导航事件。这些事件的范围涵盖了从开始导航到结束导航之间的很多时间点。下表中列出了全部导航事件：

<table>
  <tr>

    <th>

      Router Event

      路由器事件

    </th>

    <th>

      Description

      说明

    </th>

  </tr>

  <tr>

    <td>

      <code>NavigationStart</code>

    </td>

    <td>

      An [event](api/router/NavigationStart) triggered when navigation starts.

      本[事件](api/router/NavigationStart)会在导航开始时触发。

    </td>
  </tr>

  <tr>
    <td>
      <code>RouteConfigLoadStart</code>
    </td>
    <td>

      An [event](api/router/RouteConfigLoadStart) triggered before the `Router`
      [lazy loads](#asynchronous-routing) a route configuration.

      本[事件](api/router/RouteConfigLoadStart)会在 `Router` [惰性加载](#asynchronous-routing) 某个路由配置之前触发。

    </td>
  </tr>

  <tr>
    <td>
      <code>RouteConfigLoadEnd</code>
    </td>
    <td>

      An [event](api/router/RouteConfigLoadEnd) triggered after a route has been lazy loaded.

      本[事件](api/router/RouteConfigLoadEnd)会在惰性加载了某个路由后触发。

    </td>

  </tr>

  <tr>

    <td>

      <code>RoutesRecognized</code>

    </td>

    <td>

      An [event](api/router/RoutesRecognized) triggered when the Router parses the URL and the routes are recognized.

      本[事件](api/router/RoutesRecognized)会在路由器解析完 URL，并识别出了相应的路由时触发

    </td>

  </tr>

  <tr>

    <td>

      <code>GuardsCheckStart</code>
    </td>
    <td>

      An [event](api/router/GuardsCheckStart) triggered when the Router begins the Guards phase of routing.

      本[事件](api/router/GuardsCheckStart)会在路由器开始 Guard 阶段之前触发。

    </td>
  </tr>

  <tr>
    <td>
      <code>ChildActivationStart</code>
    </td>
    <td>

      An [event](api/router/ChildActivationStart) triggered when the Router begins activating a route's children.

      本[事件](api/router/ChildActivationStart)会在路由器开始激活路由的子路由时触发。

    </td>
  </tr>

  <tr>
    <td>
      <code>ActivationStart</code>
    </td>
    <td>

      An [event](api/router/ActivationStart) triggered when the Router begins activating a route.

      本[事件](api/router/ActivationStart)会在路由器开始激活某个路由时触发。

    </td>
  </tr>

  <tr>
    <td>
      <code>GuardsCheckEnd</code>
    </td>
    <td>

      An [event](api/router/GuardsCheckEnd) triggered when the Router finishes the Guards phase of routing successfully.

      本[事件](api/router/GuardsCheckEnd)会在路由器成功完成了 Guard 阶段时触发。

    </td>
  </tr>

  <tr>
    <td>
      <code>ResolveStart</code>
    </td>

    <td>

      An [event](api/router/ResolveStart) triggered when the Router begins the Resolve phase of routing.

      本[事件](api/router/ResolveStart)会在 `Router` 开始解析（Resolve）阶段时触发。

    </td>

  </tr>

  <tr>

    <td>

      <code>ResolveEnd</code>
    </td>
    <td>

      An [event](api/router/ResolveEnd) triggered when the Router finishes the Resolve phase of routing successfuly.

      本[事件](api/router/ResolveEnd)会在路由器成功完成了路由的解析（Resolve）阶段时触发。

    </td>
  </tr>

  <tr>
    <td>
      <code>ChildActivationEnd</code>
    </td>

    <td>

      An [event](api/router/ChildActivationEnd) triggered when the Router finishes activating a route's children.

      本[事件](api/router/ChildActivationEnd)会在路由器激活了路由的子路由时触发。

    </td>
  </tr>

  <tr>
    <td>
      <code>ActivationEnd</code>
    </td>
    <td>

      An [event](api/router/ActivationStart) triggered when the Router finishes activating a route.

      本[事件](api/router/ActivationStart)会在路由器激活了某个路由时触发。

    </td>

  </tr>

  <tr>

    <td>

      <code>NavigationEnd</code>

    </td>

    <td>

      An [event](api/router/NavigationEnd) triggered when navigation ends successfully.

      本[事件](api/router/NavigationEnd)会在导航成功结束之后触发。

    </td>

  </tr>

  <tr>

    <td>

      <code>NavigationCancel</code>

    </td>

    <td>

      An [event](api/router/NavigationCancel) triggered when navigation is canceled.
      This can happen when a [Route Guard](#guards) returns false during navigation,
      or redirects by returning a `UrlTree`.

      本[事件](api/router/NavigationCancel)会在导航被取消之后触发。
      这可能是因为在导航期间某个[路由守卫](#guards)返回了 `false`。

    </td>

  </tr>

  <tr>

    <td>

      <code>NavigationError</code>

    </td>

    <td>

      An [event](api/router/NavigationError) triggered when navigation fails due to an unexpected error.

      这个[事件](api/router/NavigationError)会在导航由于意料之外的错误而失败时触发。

    </td>
  </tr>

  <tr>
    <td>
      <code>Scroll</code>
    </td>
    <td>

      An [event](api/router/Scroll) that represents a scrolling event.

      本[事件](api/router/Scroll)代表一个滚动事件。

    </td>

  </tr>
</table>

These events are logged to the console when the `enableTracing` option is enabled also. For an example of filtering router navigation events, visit the [router section](guide/observables-in-angular#router) of the [Observables in Angular](guide/observables-in-angular) guide.

当启用了 `enableTracing` 选项时，这些事件也同时会记录到控制台中。要想查看对路由导航事件进行过滤的例子，请访问 [Angular 中的可观察对象](guide/observables-in-angular)一章的[路由器部分](guide/observables-in-angular#router)


{@a basics-summary}

### Summary

### 总结一下

The application has a configured router.
The shell component has a `RouterOutlet` where it can display views produced by the router.
It has `RouterLink`s that users can click to navigate via the router.

该应用有一个配置过的路由器。
外壳组件中有一个 `RouterOutlet`，它能显示路由器所生成的视图。
它还有一些 `RouterLink`，用户可以点击它们，来通过路由器进行导航。

Here are the key `Router` terms and their meanings:

下面是一些*路由器*中的关键词汇及其含义：

<table>

  <tr>

    <th>

      Router Part

      路由器部件

    </th>

    <th>

      Meaning

      含义

    </th>

  </tr>

  <tr>

    <td>

      <code>Router</code>

      <code>Router</code>（路由器）

    </td>

    <td>

      Displays the application component for the active URL.
      Manages navigation from one component to the next.

      为激活的 URL 显示应用组件。管理从一个组件到另一个组件的导航

    </td>

  </tr>

  <tr>

    <td>

      <code>RouterModule</code>

    </td>

    <td>

      A separate NgModule that provides the necessary service providers
      and directives for navigating through application views.

      一个独立的 NgModule，用于提供所需的服务提供商，以及用来在应用视图之间进行导航的指令。

    </td>

  </tr>

  <tr>

    <td>

      <code>Routes</code>

      <code>Routes</code>（路由数组）

    </td>

    <td>

      Defines an array of Routes, each mapping a URL path to a component.

      定义了一个路由数组，每一个都会把一个 URL 路径映射到一个组件。

    </td>

  </tr>

  <tr>

    <td>

      <code>Route</code>

      <code>Route</code>（路由）

    </td>

    <td>

      Defines how the router should navigate to a component based on a URL pattern.
      Most routes consist of a path and a component type.

      定义路由器该如何根据 URL 模式（pattern）来导航到组件。大多数路由都由路径和组件类构成。

    </td>

  </tr>

  <tr>

    <td>

      <code>RouterOutlet</code>

      <code>RouterOutlet</code>（路由出口）

    </td>

    <td>

      The directive (<code>&lt;router-outlet></code>) that marks where the router displays a view.

      该指令（<code>&lt;router-outlet></code>）用来标记出路由器该在哪里显示视图。

    </td>

  </tr>

  <tr>

    <td>

      <code>RouterLink</code>

      <code>RouterLink</code>（路由链接）

    </td>

    <td>

      The directive for binding a clickable HTML element to
      a route. Clicking an element with a <code>routerLink</code> directive
      that is bound to a <i>string</i> or a <i>link parameters array</i> triggers a navigation.

      这个指令把可点击的 HTML 元素绑定到某个路由。点击带有 <code>routerLink</code> 指令（绑定到<i>字符串</i>或<i>链接参数数组</i>）的元素时就会触发一次导航。

    </td>

  </tr>

  <tr>

    <td>

      <code>RouterLinkActive</code>

      <code>RouterLinkActive</code>（活动路由链接）

    </td>

    <td>

      The directive for adding/removing classes from an HTML element when an associated
      <code>routerLink</code> contained on or inside the element becomes active/inactive.

      当 HTML 元素上或元素内的<code>routerLink</code>变为激活或非激活状态时，该指令为这个 HTML 元素添加或移除 CSS 类。

    </td>

  </tr>

  <tr>

    <td>

      <code>ActivatedRoute</code>

      <code>ActivatedRoute</code>（激活的路由）

    </td>

    <td>

      A service that is provided to each route component that contains route specific
      information such as route parameters, static data, resolve data, global query params, and the global fragment.

      为每个路由组件提供的一个服务，它包含特定于路由的信息，比如路由参数、静态数据、解析数据、全局查询参数和全局碎片（fragment）。

    </td>

  </tr>

  <tr>

    <td>

      <code>RouterState</code>

      <code>RouterState</code>（路由器状态）

    </td>

    <td>

      The current state of the router including a tree of the currently activated
      routes together with convenience methods for traversing the route tree.

      路由器的当前状态包含了一棵由程序中激活的路由构成的树。它包含一些用于遍历路由树的快捷方法。

    </td>

  </tr>

  <tr>

    <td>

      <b><i>Link parameters array</i></b>

      <b><i>链接参数数组</i></b>

    </td>

    <td>

      An array that the router interprets as a routing instruction.
      You can bind that array to a <code>RouterLink</code> or pass the array as an argument to
      the <code>Router.navigate</code> method.

      这个数组会被路由器解释成一个路由操作指南。你可以把一个<code>RouterLink</code>绑定到该数组，或者把它作为参数传给<code>Router.navigate</code>方法。

    </td>

  </tr>

  <tr>

    <td>

      <b><i>Routing component</i></b>

      <b><i>路由组件</i></b>

    </td>

    <td>

      An Angular component with a <code>RouterOutlet</code> that displays views based on router navigations.

      一个带有<code>RouterOutlet</code>的 Angular 组件，它根据路由器的导航来显示相应的视图。

    </td>

  </tr>

</table>

{@a sample-app-intro}

## The sample application

## 范例应用

This guide describes development of a multi-page routed sample application.
Along the way, it highlights design decisions and describes key features of the router such as:

本章要讲的是如何开发一个带路由的多页面应用。
接下来会重点讲它的设计决策，并描述路由的关键特性，比如：

* Organizing the application features into modules.

   把应用的各个特性组织成模块。

* Navigating to a component (*Heroes* link to "Heroes List").

   导航到组件（*Heroes* 链接到“英雄列表”组件）。

* Including a route parameter (passing the Hero `id` while routing to the "Hero Detail").

   包含一个路由参数（当路由到“英雄详情”时，把该英雄的 `id` 传进去）。

* Child routes (the *Crisis Center* has its own routes).

   子路由（*危机中心*特性有一组自己的路由）。

* The `CanActivate` guard (checking route access).

   `CanActivate` 守卫（检查路由的访问权限）。

* The `CanActivateChild` guard (checking child route access).

   `CanActivateChild` 守卫（检查子路由的访问权限）。

* The `CanDeactivate` guard (ask permission to discard unsaved changes).

   `CanDeactivate` 守卫（询问是否丢弃未保存的更改）。

* The `Resolve` guard (pre-fetching route data).

   `Resolve` 守卫（预先获取路由数据）。

* Lazy loading feature modules.

   惰性加载特性模块。

* The `CanLoad` guard (check before loading feature module assets).

   `CanLoad` 守卫（在加载特性模块之前进行检查）。

The guide proceeds as a sequence of milestones as if you were building the app step-by-step.
But, it is not a tutorial and it glosses over details of Angular application construction
that are more thoroughly covered elsewhere in the documentation.

如果打算一步步构建出本应用，本章就会经过一系列里程碑。
但是，本章并不是一个教程，它隐藏了构造 Angular 应用的细节，那些细节会在本文档的其它地方展开。

The full source for the final version of the app can be seen and downloaded from the <live-example></live-example>.

本应用的最终版源码可以在<live-example></live-example>中查看和下载。

### The sample application in action

### 范例程序的动图

Imagine an application that helps the _Hero Employment Agency_ run its business.
Heroes need work and the agency finds crises for them to solve.

假设本程序会用来帮助“英雄管理局”运行他们的业务。
英雄们需要找工作，而“英雄管理局”为他们寻找待解决的危机。

The application has three main feature areas:

本应用具有三个主要的特性区：

1. A *Crisis Center* for maintaining the list of crises for assignment to heroes.

   *危机中心*用于维护要指派给英雄的危机列表。

1. A *Heroes* area for maintaining the list of heroes employed by the agency.

   *英雄*区用于维护管理局雇佣的英雄列表。

1. An *Admin* area to manage the list of crises and heroes.

   *管理*区会管理危机和英雄的列表。

Try it by clicking on this <live-example title="Hero Employment Agency Live Example">live example link</live-example>.

点击<live-example title="英雄职介中心的在线例子"></live-example>试用一下。

Once the app warms up, you'll see a row of navigation buttons
and the *Heroes* view with its list of heroes.

等应用热身完毕，你就会看到一排导航按钮，以及一个*英雄列表*视图。

<div class="lightbox">
  <img src='generated/images/guide/router/hero-list.png' alt="Hero List">
</div>

Select one hero and the app takes you to a hero editing screen.

选择其中之一，该应用就会把你带到此英雄的编辑页面。

<div class="lightbox">
  <img src='generated/images/guide/router/hero-detail.png' alt="Crisis Center Detail">
</div>

Alter the name.
Click the "Back" button and the app returns to the heroes list which displays the changed hero name.
Notice that the name change took effect immediately.

修改完名字，再点击“后退”按钮，应用又回到了英雄列表页，其中显示的英雄名已经变了。注意，对名字的修改会立即生效。

Had you clicked the browser's back button instead of the "Back" button,
the app would have returned you to the heroes list as well.
Angular app navigation updates the browser history as normal web navigation does.

另外你也可以点击浏览器本身的后退按钮，这样也同样会回到英雄列表页。
在 Angular 应用中导航也会和标准的 Web 导航一样更新浏览器中的历史。

Now click the *Crisis Center* link for a list of ongoing crises.

现在，点击*危机中心*链接，前往*危机*列表页。

<div class="lightbox">
  <img src='generated/images/guide/router/crisis-center-list.png' alt="Crisis Center List">
</div>

Select a crisis and the application takes you to a crisis editing screen.
The _Crisis Detail_ appears in a child component on the same page, beneath the list.

选择其中之一，该应用就会把你带到此危机的编辑页面。
*危机详情*是当前页的子组件，就在列表的紧下方。

Alter the name of a crisis.
Notice that the corresponding name in the crisis list does _not_ change.

修改危机的名称。
注意，危机列表中的相应名称**并没有**修改。

<div class="lightbox">
  <img src='generated/images/guide/router/crisis-center-detail.png' alt="Crisis Center Detail">
</div>

Unlike *Hero Detail*, which updates as you type,
*Crisis Detail* changes are temporary until you either save or discard them by pressing the "Save" or "Cancel" buttons.
Both buttons navigate back to the *Crisis Center* and its list of crises.

这和*英雄详情*页略有不同。*英雄详情*会立即保存你所做的更改。
而*危机详情*页中，你的更改都是临时的 —— 除非按“保存”按钮保存它们，或者按“取消”按钮放弃它们。
这两个按钮都会导航回*危机中心*，显示危机列表。

***Do not click either button yet***.
Click the browser back button or the "Heroes" link instead.

***先不要点击这些按钮***。
而是点击浏览器的后退按钮，或者点击“Heroes”链接。

Up pops a dialog box.

这时会弹出一个对话框。

<div class="lightbox">
  <img src='generated/images/guide/router/confirm-dialog.png' alt="Confirm Dialog">
</div>

You can say "OK" and lose your changes or click "Cancel" and continue editing.

你可以回答“确定”以放弃这些更改，或者回答“取消”来继续编辑。

Behind this behavior is the router's `CanDeactivate` guard.
The guard gives you a chance to clean-up or ask the user's permission before navigating away from the current view.

这种行为的幕后是路由器的 `CanDeactivate` 守卫。
该守卫让你有机会进行清理工作或在离开当前视图之前请求用户的许可。

The `Admin` and `Login` buttons illustrate other router capabilities to be covered later in the guide.
This short introduction will do for now.

`Admin` 和 `Login` 按钮用于演示路由器的其它能力，本章稍后的部分会讲解它们。这里只是个简短的讲解。

Proceed to the first application milestone.

这就开始本应用的第一个里程碑。

{@a getting-started}

## Milestone 1: Getting started

## 里程碑 1：起步

Begin with a simple version of the app that navigates between two empty views.

开始本应用的一个简版，它在两个空路由之间导航。

<div class="lightbox">
  <img src='generated/images/guide/router/router-1-anim.gif' alt="App in action">
</div>

{@a import}

Generate a sample application to follow the walkthrough.

遵循这些步骤生成一个范例应用。

<code-example language="none" class="code-shell">
  ng new angular-router-sample
</code-example>

### Define Routes

### 定义路由

A router must be configured with a list of route definitions.

路由器必须用“路由定义”的列表进行配置。

Each definition translates to a [Route](api/router/Route) object which has two things: a
`path`, the URL path segment for this route; and a
`component`, the component associated with this route.

每个定义都被翻译成了一个[Route](api/router/Route)对象。该对象有一个 `path` 字段，表示该路由中的 URL 路径部分，和一个 `component` 字段，表示与该路由相关联的组件。

The router draws upon its registry of definitions when the browser URL changes
or when application code tells the router to navigate along a route path.

当浏览器的 URL 变化时或在代码中告诉路由器导航到一个路径时，路由器就会翻出它用来保存这些路由定义的注册表。

In simpler terms, you might say this of the first route:

直白的说，你可以这样解释第一个路由：

* When the browser's location URL changes to match the path segment `/crisis-center`, then
the router activates an instance of the `CrisisListComponent` and displays its view.

   当浏览器地址栏的 URL 变化时，如果它匹配上了路径部分 `/crisis-center`，路由器就会激活一个 `CrisisListComponent` 的实例，并显示它的视图。

* When the application requests navigation to the path `/crisis-center`, the router
activates an instance of `CrisisListComponent`, displays its view, and updates the
browser's address location and history with the URL for that path.

   **当应用程序请求导航到路径 `/crisis-center` 时，路由器激活一个 `CrisisListComponent` 的实例，显示它的视图，并将该路径更新到浏览器地址栏和历史。**

The first configuration defines an array of two routes with simple paths leading to the
`CrisisListComponent` and `HeroListComponent`. Generate the `CrisisList` and `HeroList` components.

第一个配置定义了由两个路由构成的数组，它们用简单的路径指向了 `CrisisListComponent` 和 `HeroListComponent`。来生成 `CrisisList` 和 `HeroList`。

<code-example language="none" class="code-shell">
  ng generate component crisis-list
</code-example>

<code-example language="none" class="code-shell">
  ng generate component hero-list
</code-example>

Replace the contents of each component with the sample HTML below.

把每个组件的内容都替换成下列范例 HTML。

<code-tabs>

  <code-pane header="src/app/crisis-list/crisis-list.component.html" path="router/src/app/crisis-list/crisis-list.component.1.html">

  </code-pane>

  <code-pane header="src/app/hero-list/hero-list.component.html" path="router/src/app/hero-list/hero-list.component.1.html" region="template">

  </code-pane>

</code-tabs>

### Register Router and Routes

### 注册路由器与路由定义

In order to use the Router, you must first register the `RouterModule` from the `@angular/router` package. Define an array of routes, `appRoutes`, and pass them to the `RouterModule.forRoot()` method. It returns a module, containing the configured `Router` service provider, plus other providers that the routing library requires. Once the application is bootstrapped, the `Router` performs the initial navigation based on the current browser URL.

要使用路由器，必须先注册来自 `@angular/router` 包中的 `RouterModule`。
定义一个路由数组 `appRoutes` 并把它传给 `RouterModule.forRoot()` 方法。
它会返回一个模块，其中包含配置好的 `Router` 服务提供商，以及路由库所需的其它提供商。
一旦启动了应用，`Router` 就会根据当前的浏览器 URL 进行首次导航。

<div class="alert is-important">

  **Note:** The `RouterModule.forRoot` method is a pattern used to register application-wide providers. Read more about application-wide providers in the [Singleton services](guide/singleton-services#forRoot-router) guide.

  **注意：** `RouterModule.forRoot` 方法是用于注册全应用级提供商的编码模式。要详细了解全应用级提供商，参见[单例服务](guide/singleton-services#forRoot-router) 一章。

</div>


<code-example path="router/src/app/app.module.1.ts" header="src/app/app.module.ts (first-config)" region="first-config"></code-example>

<div class="alert is-helpful">

Adding the configured `RouterModule` to the `AppModule` is sufficient for simple route configurations.
As the application grows, you'll want to [refactor the routing configuration](#refactor-the-routing-configuration-into-a-routing-module) into a separate file
and create a **[Routing Module](#routing-module)**, a special type of `Service Module` dedicated to the purpose
of routing in feature modules.

作为简单的路由配置，将添加配置好的 `RouterModule` 到 `AppModule` 中就足够了。
随着应用的成长，你将需要[将路由配置重构](#refactor-the-routing-configuration-into-a-routing-module)到单独的文件中，并创建**[路由模块](#routing-module)** - 一种特别的、专门为特性模块的路由器服务的**服务模块**。

</div>

Registering the `RouterModule.forRoot()` in the `AppModule` imports makes the `Router` service available everywhere in the application.

把 `RouterModule.forRoot()` 注册到 `AppModule` 的 `imports` 中，能让该 `Router` 服务在应用的任何地方都能使用。

{@a shell}

### Add the Router Outlet

### 添加路由出口

The root `AppComponent` is the application shell. It has a title, a navigation bar with two links, and a router outlet where the router swaps components on and off the page. Here's what you get:

根组件 `AppComponent` 是本应用的壳。它在顶部有一个标题、一个带两个链接的导航条，在底部有一个*路由器出口*，路由器会在它所指定的位置上把组件切入或调出页面。就像下图中所标出的：

<div class="lightbox">
  <img src='generated/images/guide/router/shell-and-outlet.png' alt="Shell">
</div>

The router outlet serves as a placeholder when the routed components will be rendered below it.

路由出口扮演一个占位符的角色，路由组件将会渲染在它的下方。

{@a shell-template}

The corresponding component template looks like this:

该组件所对应的模板是这样的：

<code-example path="router/src/app/app.component.1.html" header="src/app/app.component.html"></code-example>

{@a wildcard}

### Define a Wildcard route

### 定义通配符路由

You've created two routes in the app so far, one to `/crisis-center` and the other to `/heroes`. Any other URL causes the router to throw an error and crash the app.

你以前在应用中创建过两个路由，一个是 `/crisis-center`，另一个是 `/heroes`。
所有其它 URL 都会导致路由器抛出错误，并让应用崩溃。

Add a **wildcard** route to intercept invalid URLs and handle them gracefully.
A _wildcard_ route has a path consisting of two asterisks. It matches _every_ URL.
The router will select _this_ route if it can't match a route earlier in the configuration.
A wildcard route can navigate to a custom "404 Not Found" component or [redirect](#redirect) to an existing route.

可以添加一个**通配符**路由来拦截所有无效的 URL，并优雅的处理它们。
*通配符*路由的 `path` 是两个星号（`**`），它会匹配*任何* URL。
当路由器匹配不上以前定义的那些路由时，它就会选择*这个*路由。
通配符路由可以导航到自定义的“404 Not Found”组件，也可以[重定向](guide/router#redirect)到一个现有路由。

<div class="alert is-helpful">

The router selects the route with a [_first match wins_](#example-config) strategy.
Wildcard routes are the least specific routes in the route configuration.
Be sure it is the _last_ route in the configuration.

路由器使用[先匹配者优先](guide/router#example-config)的策略来选择路由。
通配符路由是路由配置中最没有特定性的那个，因此务必确保它是配置中的*最后一个*路由。

</div>

To test this feature, add a button with a `RouterLink` to the `HeroListComponent` template and set the link to `"/sidekicks"`.

要测试本特性，请往 `HeroListComponent` 的模板中添加一个带 `RouterLink` 的按钮，并且把它的链接设置为 `"/sidekicks"`。

<code-example path="router/src/app/hero-list/hero-list.component.1.html" header="src/app/hero-list/hero-list.component.html (excerpt)"></code-example>

The application will fail if the user clicks that button because you haven't defined a `"/sidekicks"` route yet.

当用户点击该按钮时，应用就会失败，因为你尚未定义过 `"/sidekicks"` 路由。

Instead of adding the `"/sidekicks"` route, define a `wildcard` route instead and have it navigate to a simple `PageNotFoundComponent`.

不要添加 `"/sidekicks"` 路由，而是定义一个“通配符”路由，让它直接导航到 `PageNotFoundComponent` 组件。

<code-example path="router/src/app/app.module.1.ts" header="src/app/app.module.ts (wildcard)" region="wildcard"></code-example>

Create the `PageNotFoundComponent` to display when users visit invalid URLs.

创建 `PageNotFoundComponent`，以便在用户访问无效网址时显示它。

<code-example language="none" class="code-shell">
  ng generate component page-not-found
</code-example>

<code-example path="router/src/app/page-not-found/page-not-found.component.html" header="src/app/page-not-found.component.html (404 component)"></code-example>

Now when the user visits `/sidekicks`, or any other invalid URL, the browser displays "Page not found".
The browser address bar continues to point to the invalid URL.

现在，当用户访问 `/sidekicks` 或任何无效的 URL 时，浏览器就会显示“Page not found”。
浏览器的地址栏仍指向无效的 URL。

{@a redirect}

### Set up redirects

### 设置跳转

When the application launches, the initial URL in the browser bar is something like:

应用启动时，浏览器地址栏中的初始 URL 是这样的：

<code-example>
  localhost:4200
</code-example>

That doesn't match any of the concrete configured routes which means
the router falls through to the wildcard route and displays the `PageNotFoundComponent`.

它不能匹配上任何具体的路由，于是就会走到通配符路由中去，并且显示 `PageNotFoundComponent`。

The application needs a **default route** to a valid page.
The default page for this app is the list of heroes.
The app should navigate there as if the user clicked the "Heroes" link or pasted `localhost:4200/heroes` into the address bar.

这个应用需要一个有效的**默认路由**，在这里应该用英雄列表作为默认页。当用户点击"Heroes"链接或把 `localhost:4200/heroes` 粘贴到地址栏时，它应该导航到列表页。

The preferred solution is to add a `redirect` route that translates the initial relative URL (`''`)
to the desired default path (`/heroes`). The browser address bar shows `.../heroes` as if you'd navigated there directly.

首选方案是添加一个 `redirect` 路由来把最初的相对路径（`''`）转换成期望的默认路径（`/heroes`）。
浏览器地址栏会显示 `.../heroes`，就像你直接导航到那里一样。

Add the default route somewhere _above_ the wildcard route.
It's just above the wildcard route in the following excerpt showing the complete `appRoutes` for this milestone.

在通配符路由*上方*添加一个默认路由。
在下方的代码片段中，它出现在通配符路由的紧上方，展示了这个里程碑的完整 `appRoutes`。

<code-example path="router/src/app/app-routing.module.1.ts" header="src/app/app-routing.module.ts (appRoutes)" region="appRoutes"></code-example>


A redirect route requires a `pathMatch` property to tell the router how to match a URL to the path of a route.
The router throws an error if you don't.
In this app, the router should select the route to the `HeroListComponent` only when the *entire URL* matches `''`,
so set the `pathMatch` value to `'full'`.

重定向路由需要一个 `pathMatch` 属性，来告诉路由器如何用 URL 去匹配路由的路径，否则路由器就会报错。
在本应用中，路由器应该只有在*完整的 URL*等于 `''` 时才选择 `HeroListComponent` 组件，因此要把 `pathMatch` 设置为 `'full'`。

<div class="alert is-helpful">


Technically, `pathMatch = 'full'` results in a route hit when the *remaining*, unmatched segments of the URL match `''`.
In this example, the redirect is in a top level route so the *remaining* URL and the *entire* URL are the same thing.

从技术角度说，`pathMatch = 'full'` 导致 URL 中*剩下的*、未匹配的部分必须等于 `''`。
在这个例子中，跳转路由在一个顶级路由中，因此*剩下的*URL 和*完整的*URL 是一样的。

The other possible `pathMatch` value is `'prefix'` which tells the router
to match the redirect route when the *remaining* URL ***begins*** with the redirect route's _prefix_ path.

`pathMatch` 的另一个可能的值是 `'prefix'`，它会告诉路由器：当*剩下的*URL 以这个跳转路由中的 `prefix` 值开头时，就会匹配上这个跳转路由。

Don't do that here.
If the `pathMatch` value were `'prefix'`, _every_ URL would match `''`.

在这里不能这么做！如果 `pathMatch` 的值是 `'prefix'`，那么*每个*URL 都会匹配上 `''`。

Try setting it to `'prefix'` then click the `Go to sidekicks` button.
Remember that's a bad URL and you should see the "Page not found" page.
Instead, you're still on the "Heroes" page.
Enter a bad URL in the browser address bar.
You're instantly re-routed to `/heroes`.
_Every_ URL, good or bad, that falls through to _this_ route definition
will be a match.

尝试把它设置为 `'prefix'`，然后点击 `Go to sidekicks` 按钮。别忘了，它是一个无效 URL，本应显示“Page not found”页。
但是，你仍然在“英雄列表”页中。在地址栏中输入一个无效的 URL，你又被路由到了 `/heroes`。
*每一个* URL，无论有效与否，都会匹配上这个路由定义。

The default route should redirect to the `HeroListComponent` _only_ when the _entire_ url is  `''`.
Remember to restore the redirect to `pathMatch = 'full'`.

默认路由应该只有在*整个*URL 等于 `''` 时才重定向到 `HeroListComponent`，别忘了把重定向路由设置为 `pathMatch = 'full'`。

Learn more in Victor Savkin's
[post on redirects](http://vsavkin.tumblr.com/post/146722301646/angular-router-empty-paths-componentless-routes).

要了解更多，参见 Victor Savkin 的帖子[关于重定向](http://victorsavkin.com/post/146722301646/angular-router-empty-paths-componentless-routes)。

</div>


### Basics wrap up

### “起步阶段”总结

You've got a very basic navigating app, one that can switch between two views
when the user clicks a link.

你得到了一个非常基本的、带导航的应用，当用户点击链接时，它能在两个视图之间切换。

You've learned how to do the following:

你学到了如何：

* Load the router library.

   加载路由库

* Add a nav bar to the shell template with anchor tags, `routerLink`  and `routerLinkActive` directives.

   往壳组件的模板中添加一个导航条，导航条中有一些 A 标签、`routerLink` 指令和 `routerLinkActive` 指令

* Add a `router-outlet` to the shell template where views will be displayed.

   往壳组件的模板中添加一个 `router-outlet` 指令，视图将会被显示在那里

* Configure the router module with `RouterModule.forRoot()`.

   用 `RouterModule.forRoot()` 配置路由器模块

* Set the router to compose HTML5 browser URLs.

   设置路由器，使其合成 HTML5 模式的浏览器 URL

* handle invalid routes with a `wildcard` route.

   使用通配符路由来处理无效路由

* navigate to the default route when the app launches with an empty path.

   当应用在空路径下启动时，导航到默认路由

The starter app's structure looks like this:

这个初学者应用的结构是这样的：

<div class='filetree'>

  <div class='file'>

    angular-router-sample
  </div>

  <div class='children'>

    <div class='file'>

      src

    </div>

    <div class='children'>

      <div class='file'>

        app

      </div>

      <div class='children'>

        <div class='file'>

          crisis-list
        </div>

        <div class='children'>

          <div class='file'>

            crisis-list.component.css

          </div>

        <div class='file'>

          crisis-list.component.html

        </div>

        <div class='file'>

          crisis-list.component.ts

        </div>

        </div>

        <div class='file'>

          hero-list
        </div>

        <div class='children'>

          <div class='file'>

            hero-list.component.css

          </div>

          <div class='file'>

            hero-list.component.html

          </div>

          <div class='file'>

            hero-list.component.ts

          </div>

        </div>

        <div class='file'>
          page-not-found
        </div>

        <div class='children'>

          <div class='file'>

            page-not-found.component.css

          </div>

          <div class='file'>

            page-not-found.component.html

          </div>

          <div class='file'>

            page-not-found.component.ts

          </div>

        </div>

        <div class='file'>
          app.component.css
        </div>

        <div class='file'>
          app.component.html
        </div>

        <div class='file'>
          app.component.ts
        </div>

        <div class='file'>

          app.module.ts
        </div>

      </div>

      <div class='file'>

        main.ts

      </div>

      <div class='file'>

        index.html

      </div>

      <div class='file'>

        styles.css

      </div>

      <div class='file'>

        tsconfig.json

      </div>

    </div>

    <div class='file'>

      node_modules ...

    </div>

    <div class='file'>

      package.json

    </div>

  </div>

</div>

Here are the files discussed in this milestone.

下面是当前里程碑中讨论过的文件列表：

<code-tabs>

  <code-pane header="app.component.html" path="router/src/app/app.component.1.html">

  </code-pane>

  <code-pane header="app.module.ts" path="router/src/app/app.module.1.ts">

  </code-pane>

  <code-pane header="hero-list/hero-list.component.html" path="router/src/app/hero-list/hero-list.component.1.html">

  </code-pane>

  <code-pane header="crisis-list/crisis-list.component.html" path="router/src/app/crisis-list/crisis-list.component.1.html">

  </code-pane>

  <code-pane header="page-not-found/page-not-found.component.html" path="router/src/app/page-not-found/page-not-found.component.html">

  </code-pane>

  <code-pane header="index.html" path="router/src/index.html">

  </code-pane>

</code-tabs>

{@a routing-module}

## Milestone 2: *Routing module*

## 里程碑 2：**路由模块**

In the initial route configuration, you provided a simple setup with two routes used
to configure the application for routing. This is perfectly fine for simple routing.
As the application grows and you make use of more `Router` features, such as guards,
resolvers, and child routing, you'll naturally want to refactor the routing configuration into its own file.
We recommend moving the routing information into a special-purpose module called a *Routing Module*.

在原始的路由配置中，你提供了仅有两个路由的简单配置来设置应用的路由。对于简单的路由，这没有问题。
  随着应用的成长，你用到了更多**路由器**特性，比如守卫、解析器和子路由等，你会很自然地想要重构路由。
  我们建议将路由信息移到一个单独的特殊用途的模块，叫做**路由模块**。

The **Routing Module** has several characteristics:

**路由模块**有一系列特性：

* Separates routing concerns from other application concerns.

   把路由这个关注点从其它应用类关注点中分离出去。

* Provides a module to replace or remove when testing the application.

   测试特性模块时，可以替换或移除路由模块。

* Provides a well-known location for routing service providers including guards and resolvers.

   为路由服务提供商（包括守卫和解析器等）提供一个共同的地方。

* Does **not** declare components.

   **不要**声明组件。

{@a integrate-routing}

### Integrate routing with your app

### 把路由集成到应用中

The sample routing application does not include routing by default.
When you use the [Angular CLI](cli) to create a project that will use routing, set the `--routing` option for the project or app, and for each NgModule.
When you create or initialize a new project (using the CLI [`ng new`](cli/new) command) or a new app (using the [`ng generate app`](cli/generate) command), specify the `--routing` option. This tells the CLI to include the `@angular/router` npm package and create a file named `app-routing.module.ts`.
You can then use routing in any NgModule that you add to the project or app.

路由应用范例中默认不包含路由。
要想在使用 [Angular CLI](cli) 创建项目时支持路由，请为项目或应用的每个 NgModule 设置 `--routing` 选项。
当你用 CLI 命令 [`ng new`](cli/new) 创建新项目或用 [`ng generate app`](cli/generate) 命令创建新应用，请指定 `--routing` 选项。这会告诉 CLI 包含上 `@angular/router` 包，并创建一个名叫 `app-routing.module.ts` 的文件。
然后你就可以在添加到项目或应用中的任何 NgModule 中使用路由功能了。

For example, the following command generates an NgModule that can use routing.

比如，可以用下列命令生成带路由的 NgModule。

```sh
ng generate module my-module --routing
```

This creates a separate file named `my-module-routing.module.ts` to store the NgModule's routes.
The file includes an empty `Routes` object that you can fill with routes to different components and NgModules.

这将创建一个名叫 `my-module-routing.module.ts` 的独立文件，来保存这个 NgModule 的路由信息。
该文件包含一个空的 `Routes` 对象，你可以使用一些指向各个组件和 NgModule 的路由来填充该对象。

{@a routing-refactor}

### Refactor the routing configuration into a _routing module_

### 将路由配置重构为*路由模块*

Create an `AppRouting` module in the `/app` folder to contain the routing configuration.

在 `/app` 目录下创建一个 `AppRouting` 模块，以包含路由配置。

<code-example language="none" class="code-shell">
  ng generate module app-routing --module app --flat
</code-example>

Import the `CrisisListComponent`, `HeroListComponent`, and `PageNotFoundComponent` symbols
just like you did in the `app.module.ts`. Then move the `Router` imports
and routing configuration, including `RouterModule.forRoot()`, into this routing module.

导入 `CrisisListComponent`、`HeroListComponent` 和 `PageNotFoundCompponent` 组件，就像 `app.module.ts` 中那样。然后把 `Router` 的导入语句和路由配置以及 `RouterModule.forRoot()` 移入这个路由模块中。

Re-export the Angular `RouterModule` by adding it to the module `exports` array.
By re-exporting the `RouterModule` here the components declared in `AppModule` will have access to router directives such as `RouterLink` and `RouterOutlet`.

把 Angular 的 `RouterModule`添加到该模块的 `exports` 数组中，以便再次导出它 。
通过再次导出 `RouterModule`，当在 `AppModule` 中导入了 `AppRoutingModule` 之后，那些声明在 `AppModule` 中的组件就可以访问路由指令了，比如 `RouterLink` 和 `RouterOutlet`。

After these steps, the file should look like this.

做完这些之后，该文件变成了这样：

<code-example path="router/src/app/app-routing.module.1.ts" header="src/app/app-routing.module.ts"></code-example>

Next, update the `app.module.ts` file, removing `RouterModule.forRoot` in
the `imports` array.

接下来，修改 `app.module.ts` 文件，从 `imports` 数组中移除 `RouterModule.forRoot`。

<code-example path="router/src/app/app.module.2.ts" header="src/app/app.module.ts"></code-example>

<div class="alert is-helpful">

Later in this guide you will create [multiple routing modules](#heroes-functionality) and discover that
you must import those routing modules [in the correct order](#routing-module-order).

本章稍后的部分，你将创建一个[多路由模块](#heroes-functionality)，并揭示你为何必须[以正确的顺序导入那些路由模块](#routing-module-order)。

</div>

The application continues to work just the same, and you can use `AppRoutingModule` as
the central place to maintain future routing configuration.

应用继续照常运行，你可以把路由模块作为将来每个模块维护路由配置的中心位置。

{@a why-routing-module}

### Do you need a _Routing Module_?

### 你需要**路由模块**吗？

The _Routing Module_ *replaces* the routing configuration in the root or feature module.
_Either_ configure routes in the Routing Module _or_ within the module itself but not in both.

**路由模块**在根模块或者特性模块替换了路由配置。在路由模块或者在模块内部配置路由，但不要同时在两处都配置。

The Routing Module is a design choice whose value is most obvious when the configuration is complex
and includes specialized guard and resolver services.
It can seem like overkill when the actual configuration is dead simple.

路由模块是设计选择，它的价值在配置很复杂，并包含专门守卫和解析器服务时尤其明显。
在配置很简单时，它可能看起来很多余。

Some developers skip the Routing Module (for example, `AppRoutingModule`) when the configuration is simple and
merge the routing configuration directly into the companion module (for example, `AppModule`).

在配置很简单时，一些开发者跳过路由模块（例如 `AppRoutingModule`），并将路由配置直接混合在关联模块中（比如 `AppModule` ）。

Choose one pattern or the other and follow that pattern consistently.

从中选择一种模式，并坚持模式的一致性。

Most developers should always implement a Routing Module for the sake of consistency.
It keeps the code clean when configuration becomes complex.
It makes testing the feature module easier.
Its existence calls attention to the fact that a module is routed.
It is where developers expect to find and expand routing configuration.

大多数开发者都应该采用路由模块，以保持一致性。
它在配置复杂时，能确保代码干净。
它让测试特性模块更加容易。
它的存在让人一眼就能看出这个模块是带路由的。
开发者可以很自然的从路由模块中查找和扩展路由配置。

{@a heroes-feature}

## Milestone 3: Heroes feature

## 里程碑 3: 英雄特征区

You've seen how to navigate using the `RouterLink` directive.
Now you'll learn the following:

你刚刚学习了如何用 `RouterLink` 指令进行导航。接下来要：

* Organize the app and routes into *feature areas* using modules.

   用模块把应用和路由组织为一些*特性区*

* Navigate imperatively from one component to another.

   命令式的从一个组件导航到另一个

* Pass required and optional information in route parameters.

   通过路由传递必要信息和可选信息

This example recreates the heroes feature in the "Services" episode of the
[Tour of Heroes tutorial](tutorial/toh-pt4 "Tour of Heroes: Services"),
and you'll be copying much of the code
from the <live-example name="toh-pt4" title="Tour of Heroes: Services example code"></live-example>.

这个例子重写了[《英雄指南》](tutorial/toh-pt4 "Tour of Heroes: Services")的“服务”部分的英雄列表特性，你可以从<live-example name="toh-pt4" title="英雄指南：各个服务的范例代码"></live-example>中复制大部分代码过来。

Here's how the user will experience this version of the app:

下面是用户将看到的版本：

<div class="lightbox">
  <img src='generated/images/guide/router/router-2-anim.gif' alt="App in action">
</div>

A typical application has multiple *feature areas*,
each dedicated to a particular business purpose.

典型的应用具有多个*特性区*，每个特性区都专注于特定的业务用途。

While you could continue to add files to the `src/app/` folder,
that is unrealistic and ultimately not maintainable.
Most developers prefer to put each feature area in its own folder.

虽然你也可以把文件都放在 `src/app/` 目录下，但那样是不现实的，而且很难维护。
大部分开发人员更喜欢把每个特性区都放在它自己的目录下。

You are about to break up the app into different *feature modules*, each with its own concerns.
Then you'll import into the main module and navigate among them.

你准备把应用拆分成多个不同的*特性模块*，每个特有模块都有自己的关注点。
然后，你就会把它们导入到主模块中，并且在它们之间导航。

{@a heroes-functionality}

### Add heroes functionality

### 添加英雄管理功能

Follow these steps:

遵循下列步骤：

* Create a `HeroesModule` with routing in the heroes folder and register it with the root `AppModule`. This is where you'll be implementing the *hero management*.

  在 `heroes` 目录下创建一个带路由的 `HeroesModule`，并把它注册进 `AppModule` 中。
  这里就是你实现*英雄管理*特性的地方。

<code-example language="none" class="code-shell">
  ng generate module heroes/heroes --module app --flat --routing
</code-example>

* Move the placeholder `hero-list` folder that's in the `app` into the `heroes` folder.

  把 `app` 下占位用的 `hero-list` 移到 `heroes` 目录中。

* Copy the contents of the `heroes/heroes.component.html` from
  the <live-example name="toh-pt4" title="Tour of Heroes: Services example code">"Services" tutorial</live-example> into the `hero-list.component.html` template.

  从 <live-example name="toh-pt4" title="Tour of Heroes: Services example code">教程的 "服务" 部分</live-example>把 `heroes/heroes.component.html` 的内容复制到 `hero-list.component.html` 模板中。

  * Relabel the `<h2>` to `<h2>HEROES</h2>`.

     给 `<h2>` 加文字，改成 `<h2>HEROES</h2>`。

  * Delete the `<app-hero-detail>` component at the bottom of the template.

     删除模板底部的 `<app-hero-detail>` 组件。


* Copy the contents of the `heroes/heroes.component.css` from the live example into the `hero-list.component.css` file.

  把在线例子中 `heroes/heroes.component.css` 文件的内容复制到 `hero-list.component.css` 文件中。

* Copy the contents of the `heroes/heroes.component.ts` from the live example into the `hero-list.component.ts` file.

  把在线例子中 `heroes/heroes.component.ts` 文件的内容复制到 `hero-list.component.ts` 文件中。

  * Change the component class name to `HeroListComponent`.

    把组件类名改为 `HeroListComponent`。

  * Change the `selector` to `app-hero-list`.

    把 `selector` 改为 `app-hero-list`。

<div class="alert is-helpful">

   Selectors are **not required** for _routed components_ due to the components are dynamically inserted when the page is rendered, but are useful for identifying and targeting them in your HTML element tree.

   对于**路由组件**来说，这些选择器**不是必须的**，因为这些组件是在渲染页面时动态插入的，不过选择器对于在 HTML 元素树中标记和选中它们是很有用的。

</div>

* Copy the `hero-detail` folder, the `hero.ts`, `hero.service.ts`,  and `mock-heroes.ts` files into the `heroes` subfolder.

  把 `hero-detail` 目录中的 `hero.ts`、`hero.service.ts` 和 `mock-heroes.ts` 文件复制到 `heroes` 子目录下。

* Copy the `message.service.ts` into the `src/app` folder.

  把 `message.service.ts` 文件复制到 `src/app` 目录下。

* Update the relative path import to the `message.service` in the `hero.service.ts` file.

  在 `hero.service.ts` 文件中修改导入 `message.service` 的相对路径。

Next, you'll update the `HeroesModule` metadata.

接下来，还要修改 `HeroesModule` 的元数据。

  * Import and add the `HeroDetailComponent` and `HeroListComponent` to the `declarations` array in the `HeroesModule`.

    导入 `HeroDetailComponent` 和 `HeroListComponent`，并添加到 `HeroesModule` 模块的 `declarations` 数组中。

<code-example path="router/src/app/heroes/heroes.module.ts" header="src/app/heroes/heroes.module.ts"></code-example>

When you're done, you'll have these *hero management* files:

做完这些，你就有了四个*英雄管理*特性区的文件：

<div class='filetree'>

  <div class='file'>

    src/app/heroes

  </div>

  <div class='children'>

    <div class='file'>
      hero-detail
    </div>

      <div class='children'>

        <div class='file'>
          hero-detail.component.css
        </div>

        <div class='file'>
          hero-detail.component.html
        </div>

        <div class='file'>      
          hero-detail.component.ts
        </div>

      </div>

    <div class='file'>
      hero-list
    </div>

      <div class='children'>

        <div class='file'>
          hero-list.component.css
        </div>

        <div class='file'>
          hero-list.component.html
        </div>

        <div class='file'>      
          hero-list.component.ts
        </div></div>

    <div class='file'>

      hero.service.ts

    </div>

    <div class='file'>
      hero.ts
    </div>

    <div class='file'>
      heroes-routing.module.ts
    </div>

    <div class='file'>

      heroes.module.ts

    </div>

    <div class='file'>
      mock-heroes.ts
    </div>

    </div>


  </div>

</div>

{@a hero-routing-requirements}

#### *Hero* feature routing requirements

#### *英雄*特性区的路由需求

The heroes feature has two interacting components, the hero list and the hero detail.
The list view is self-sufficient; you navigate to it, it gets a list of heroes and displays them.

“英雄”特性有两个相互协作的组件，列表和详情。
列表视图是自给自足的，你导航到它，它会自行获取英雄列表并显示他们。

The detail view is different. It displays a particular hero. It can't know which hero to show on its own.
That information must come from outside.

详情视图就不同了。它要显示一个特定的英雄，但是它本身却无法知道显示哪一个，此信息必须来自外部。

When the user selects a hero from the list, the app should navigate to the detail view
and show that hero.
You tell the detail view which hero to display by including the selected hero's id in the route URL.

当用户从列表中选择了一个英雄时，应用就导航到详情页以显示那个英雄。
  通过把所选英雄的 id 编码进路由的 URL 中，就能告诉详情视图该显示哪个英雄。

Import the hero components from their new locations in the `src/app/heroes/` folder, define the two hero routes.

从新位置 `src/app/heroes/` 目录中导入英雄相关的组件，定义两个“英雄管理”路由。

Now that you have routes for the `Heroes` module, register them with the `Router` via the
`RouterModule` _almost_ as you did in the `AppRoutingModule`.

现在，你有了 `Heroes` 模块的路由，还得在 `RouterModule` 中把它们注册给*路由器*，和 `AppRoutingModule` 中的做法几乎完全一样。

There is a small but critical difference.
In the `AppRoutingModule`, you used the static **`RouterModule.forRoot()`** method to register the routes and application level service providers.
In a feature module you use the static **`forChild`** method.

这里有少量但是关键的不同点。
在 `AppRoutingModule` 中，你使用了静态的 `RouterModule.`**`forRoot`**方法来注册路由和全应用级服务提供商。
在特性模块中，你要改用**`forChild`**静态方法。

<div class="alert is-helpful">

Only call `RouterModule.forRoot()` in the root `AppRoutingModule`
(or the `AppModule` if that's where you register top level application routes).
In any other module, you must call the **`RouterModule.forChild`** method to register additional routes.

只在根模块 `AppRoutingModule` 中调用 `RouterModule.forRoot()`（如果在 `AppModule` 中注册应用的顶级路由，那就在 `AppModule` 中调用）。
在其它模块中，你就必须调用**`RouterModule.forChild`**方法来注册附属路由。

</div>

The updated `HeroesRoutingModule` looks like this:

修改后的 `HeroesRoutingModule` 是这样的：

<code-example path="router/src/app/heroes/heroes-routing.module.1.ts" header="src/app/heroes/heroes-routing.module.ts"></code-example>


<div class="alert is-helpful">


Consider giving each feature module its own route configuration file.
It may seem like overkill early when the feature routes are simple.
But routes have a tendency to grow more complex and consistency in patterns pays off over time.

考虑让每个特性模块都有自己的路由配置文件。
在特性路由非常简单的早期阶段它看起来可能有点过度设计，但是，路由很容易变得更复杂，随着时间的推移，保持一致的模式会让你得到回报。

</div>


{@a remove-duplicate-hero-routes}

#### Remove duplicate hero routes

#### 移除重复的“英雄管理”路由

The hero routes are currently defined in _two_ places: in the `HeroesRoutingModule`,
by way of the `HeroesModule`, and in the `AppRoutingModule`.

英雄类的路由目前定义在两个地方：`HeroesRoutingModule` 中（并最终给 `HeroesModule`）和 `AppRoutingModule` 中。

Routes provided by feature modules are combined together into their imported module's routes by the router.
This allows you to continue defining the feature module routes without modifying the main route configuration.

由特性模块提供的路由会被路由器再组合上它们所导入的模块的路由。
这让你可以继续定义特性路由模块中的路由，而不用修改主路由配置。

Remove the `HeroListComponent` import and the `/heroes` route from the `app-routing.module.ts`.

移除 `HeroListComponent` 的导入和来自 `app-routing.module.ts` 中的 `/heroes` 路由。

**Leave the default and the wildcard routes!**
These are concerns at the top level of the application itself.

**保留默认路由和通配符路由！**
它们是应用程序顶层该自己处理的关注点。

<code-example path="router/src/app/app-routing.module.2.ts" header="src/app/app-routing.module.ts (v2)"></code-example>

{@a merge-hero-routes}


#### Remove heroes declarations

#### 移除英雄列表的声明

Remove the `HeroListComponent` from the `AppModule`'s `declarations` because it's now provided by the `HeroesModule`. You can evolve the hero feature with more components and different routes. That's a key benefit of creating a separate module for each feature area.

从 `AppModule` 的 `declarations` 中移除 `HeroListComponent`，因为它现在已经改由 `HeroesModule` 提供了。
你可以让“英雄”特性独立演化，添加更多的组件或各种各样的路由。
这就是为每个特性区创建独立模块后获得的核心优势。

After these steps, the `AppModule` should look like this:

经过这些步骤，`AppModule` 变成了这样：

<code-example path="router/src/app/app.module.3.ts" header="src/app/app.module.ts" region="remove-heroes"></code-example>

{@a routing-module-order}

### Module import order matters

### 导入模块的顺序很重要

Look at the module `imports` array. Notice that the `AppRoutingModule` is _last_.
Most importantly, it comes _after_ the `HeroesModule`.

看看该模块的 `imports` 数组。注意，`AppRoutingModule` 是*最后一个*。最重要的是，它位于 `HeroesModule` 之后。

<code-example path="router/src/app/app.module.3.ts" region="module-imports" header="src/app/app.module.ts (module-imports)"></code-example>

The order of route configuration matters.
The router accepts the first route that matches a navigation request path.

路由配置的顺序很重要。
路由器会接受第一个匹配上导航所要求的路径的那个路由。

When all routes were in one `AppRoutingModule`,
you put the default and [wildcard](#wildcard) routes last, after the `/heroes` route,
so that the router had a chance to match a URL to the `/heroes` route _before_
hitting the wildcard route and navigating to "Page not found".

当所有路由都在同一个 `AppRoutingModule` 时，你要把默认路由和[通配符路由](guide/router#wildcard)放在最后（这里是在 `/heroes` 路由后面），
这样路由器才有机会匹配到 `/heroes` 路由，否则它就会先遇到并匹配上该通配符路由，并导航到“页面未找到”路由。

The routes are no longer in one file.
They are distributed across two modules, `AppRoutingModule` and `HeroesRoutingModule`.

这些路由不再位于单一文件中。他们分布在两个不同的模块中：`AppRoutingModule` 和 `HeroesRoutingModule`。

Each routing module augments the route configuration _in the order of import_.
If you list `AppRoutingModule` first, the wildcard route will be registered
_before_ the hero routes.
The wildcard route&mdash;which matches _every_ URL&mdash;will intercept the attempt to navigate to a hero route.

每个路由模块都会根据*导入的顺序*把自己的路由配置追加进去。
如果你先列出了 `AppRoutingModule`，那么通配符路由就会被注册在“英雄管理”路由*之前*。
通配符路由（它匹配*任意*URL）将会拦截住每一个到“英雄管理”路由的导航，因此事实上屏蔽了所有“英雄管理”路由。

<div class="alert is-helpful">

Reverse the routing modules and see for yourself that
a click of the heroes link results in "Page not found".
Learn about inspecting the runtime router configuration
[below](#inspect-config "Inspect the router config").

反转路由模块的导入顺序，你就会看到当点击英雄相关的链接时被导向了“页面未找到”路由。
要学习如何在运行时查看路由器配置，参见[稍后的内容](guide/router#inspect-config "Inspect the router config")。

</div>

### Route Parameters

### 路由参数

{@a route-def-with-parameter}

#### Route definition with a parameter

#### 带参数的路由定义

Return to the `HeroesRoutingModule` and look at the route definitions again.
The route to `HeroDetailComponent` has a twist.

回到 `HeroesRoutingModule` 并再次检查这些路由定义。
`HeroDetailComponent` 的路由有点特殊。

<code-example path="router/src/app/heroes/heroes-routing.module.1.ts" header="src/app/heroes/heroes-routing.module.ts (excerpt)" region="hero-detail-route"></code-example>

Notice the `:id` token in the path. That creates a slot in the path for a **Route Parameter**.
In this case, the router will insert the `id` of a hero into that slot.

注意路径中的 `:id` 令牌。它为*路由参数*在路径中创建一个“空位”。在这里，路由器把英雄的 `id` 插入到那个“空位”中。

If you tell the router to navigate to the detail component and display "Magneta",
you expect a hero id to appear in the browser URL like this:

如果要告诉路由器导航到详情组件，并让它显示“Magneta”，你会期望这个英雄的 `id` 像这样显示在浏览器的 URL 中：

<code-example format="nocode">
  localhost:4200/hero/15

</code-example>

If a user enters that URL into the browser address bar, the router should recognize the
pattern and go to the same "Magneta" detail view.

如果用户把此 URL 输入到浏览器的地址栏中，路由器就会识别出这种模式，同样进入“Magneta”的详情视图。

<div class="callout is-helpful">

<header>Route parameter: Required or optional?</header>

<header>路由参数：必须的还是可选的？</header>

Embedding the route parameter token, `:id`,
in the route definition path is a good choice for this scenario
because the `id` is *required* by the `HeroDetailComponent` and because
the value `15` in the path clearly distinguishes the route to "Magneta" from
a route for some other hero.

在这个场景下，把路由参数的令牌 `:id` 嵌入到路由定义的 `path` 中是一个好主意，因为对于 `HeroDetailComponent` 来说 `id` 是*必须的*，
而且路径中的值 `15` 已经足够把到“Magneta”的路由和到其它英雄的路由明确区分开。

</div>

{@a route-parameters}

#### Setting the route parameters in the list view

#### 在列表视图中设置路由参数

After navigating to the `HeroDetailComponent`, you expect to see the details of the selected hero.
You need *two* pieces of information: the routing path to the component and the hero's `id`.

然后导航到 `HeroDetailComponent` 组件。在那里，你期望看到所选英雄的详情，这需要两部分信息：导航目标和该英雄的 `id`。

Accordingly, the _link parameters array_ has *two* items:  the routing _path_ and a _route parameter_ that specifies the
`id` of the selected hero.

因此，这个*链接参数数组*中有两个条目：目标路由的**`path`（路径）**，和一个用来指定所选英雄 `id` 的**路由参数**。

<code-example path="router/src/app/heroes/hero-list/hero-list.component.1.html" header="src/app/heroes/hero-list/hero-list.component.html (link-parameters-array)" region="link-parameters-array"></code-example>

The router composes the destination URL from the array like this:
`localhost:4200/hero/15`.

路由器从该数组中组合出了目标 URL：
`localhost:3000/hero/15`。

<div class="alert is-helpful">

How does the target `HeroDetailComponent` learn about that `id`?
Don't analyze the URL. Let the router do it.

目标组件 `HeroDetailComponent` 该怎么知道这个 `id` 参数呢？
当然不会是自己去分析 URL 了！那是路由器的工作。

The router extracts the route parameter (`id:15`) from the URL and supplies it to
the `HeroDetailComponent` via the `ActivatedRoute` service.

路由器从 URL 中解析出路由参数（`id:15`），并通过 **ActivatedRoute** 服务来把它提供给 `HeroDetailComponent` 组件。

</div>

{@a activated-route}

### _Activated Route_ in action

### _Activated Route_ 实战

Import the `Router`, `ActivatedRoute`, and `ParamMap` tokens from the router package.

从路由器（`router`）包中导入 `Router`、`ActivatedRoute` 和 `Params` 类。

<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.1.ts" header="src/app/heroes/hero-detail/hero-detail.component.ts (activated route)" region="imports"></code-example>

Import the `switchMap` operator because you need it later to process the `Observable` route parameters.

这里导入 `switchMap` 操作符是因为你稍后将会处理路由参数的可观察对象 `Observable`。

<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.3.ts" header="src/app/heroes/hero-detail/hero-detail.component.ts (switchMap operator import)" region="rxjs-operator-import"></code-example>

{@a hero-detail-ctor}

As usual, you write a constructor that asks Angular to inject services
that the component requires and reference them as private variables.

通常，你会直接写一个构造函数，让 Angular 把组件所需的服务注入进来，自动定义同名的私有变量，并把它们存进去。

<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.3.ts" header="src/app/heroes/hero-detail/hero-detail.component.ts (constructor)" region="ctor"></code-example>

Later, in the `ngOnInit` method, you use the `ActivatedRoute` service to retrieve the parameters for the route,
pull the hero `id` from the parameters and retrieve the hero to display.

然后，在 `ngOnInit` 方法中，你用 `ActivatedRoute` 服务来接收路由的参数，从参数中取得该英雄的 `id`，并接收此英雄用于显示。

<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.3.ts" header="src/app/heroes/hero-detail/hero-detail.component.ts (ngOnInit)" region="ngOnInit"></code-example>

The `paramMap` processing is a bit tricky. When the map changes, you `get()`
the `id` parameter from the changed parameters.

`paramMap` 的处理过程有点稍复杂。当这个 map 的值变化时，你可以从变化之后的参数中 `get()` 到其 `id` 参数。

Then you tell the `HeroService` to fetch the hero with that `id` and return the result of the `HeroService` request.

然后，让 `HeroService` 去获取一个具有此 `id` 的英雄，并返回这个 `HeroService` 请求的结果。

You might think to use the RxJS `map` operator.
But the `HeroService` returns an `Observable<Hero>`.
So you flatten the `Observable` with the `switchMap` operator instead.

你可能想使用 RxJS 的 `map` 操作符。
但 `HeroService` 返回的是一个 `Observable<Hero>`。
所以你要改用 `switchMap` 操作符来打平这个 `Observable`。

The `switchMap` operator also cancels previous in-flight requests. If the user re-navigates to this route
with a new `id` while the `HeroService` is still retrieving the old `id`, `switchMap` discards that old request and returns the hero for the new `id`.

`switchMap` 操作符还会取消以前未完成的在途请求。如果用户使用新的 `id` 再次导航到该路由，而 `HeroService` 仍在接受老 `id` 对应的英雄，那么 `switchMap` 就会抛弃老的请求，并返回这个新 `id` 的英雄信息。

The observable `Subscription` will be handled by the `AsyncPipe` and the component's `hero` property will be (re)set with the retrieved hero.

这个可观察对象的 `Subscription`（订阅）将会由 `AsyncPipe` 处理，并且组件的 `hero` 属性将会设置为刚刚接收到的这个英雄。

#### _ParamMap_ API

The `ParamMap` API is inspired by the [URLSearchParams interface](https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams). It provides methods
to handle parameter access for both route parameters (`paramMap`) and query parameters (`queryParamMap`).

`ParamMap` API 是参照[URLSearchParams 接口](https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams)来设计的。它提供了一些方法来处理对路由参数（`paramMap`）和查询参数(`queryParamMap`)中的参数访问。

<table>
  <tr>

    <th>

      Member

      成员

    </th>

    <th>

      Description

      说明

    </th>

  </tr>

  <tr>

    <td>

      <code>has(name)</code>

    </td>

    <td>

    Returns `true` if the parameter name is in the map of parameters.

    如果参数名位于参数列表中，就返回 `true` 。

    </td>

  </tr>

  <tr>

    <td>

      <code>get(name)</code>

    </td>

    <td>

    Returns the parameter name value (a `string`) if present, or `null` if the parameter name is not in the map. Returns the _first_ element if the parameter value is actually an array of values.

    如果这个 map 中有参数名对应的参数值（字符串），就返回它，否则返回 `null`。如果参数值实际上是一个数组，就返回它的*第一个*元素。

    </td>

  </tr>

  <tr>

    <td>

      <code>getAll(name)</code>

    </td>

    <td>

    Returns a `string array` of the parameter name value if found, or an empty `array` if the parameter name value is not in the map. Use `getAll` when a single parameter could have multiple values.

    如果这个 map 中有参数名对应的值，就返回一个字符串数组，否则返回空数组。当一个参数名可能对应多个值的时候，请使用 `getAll`。

    </td>

  </tr>

  <tr>

    <td>

      <code>keys</code>

    </td>

    <td>

    Returns a `string array` of all parameter names in the map.

    返回这个 map 中的所有参数名组成的字符串数组。

    </td>

  </tr>
</table>

{@a reuse}

#### Observable <i>paramMap</i> and component reuse

#### <i>参数</i>的可观察对象（Observable）与组件复用

In this example, you retrieve the route parameter map from an `Observable`.
That implies that the route parameter map can change during the lifetime of this component.

在这个例子中，你接收了路由参数的 `Observable` 对象。
这种写法暗示着这些路由参数在该组件的生存期内可能会变化。

They might. By default, the router re-uses a component instance when it re-navigates to the same component type
without visiting a different component first. The route parameters could change each time.

确实如此！默认情况下，如果它没有访问过其它组件就导航到了同一个组件实例，那么路由器倾向于复用组件实例。如果复用，这些参数可以变化。

Suppose a parent component navigation bar had "forward" and "back" buttons
that scrolled through the list of heroes.
Each click navigated imperatively to the `HeroDetailComponent` with the next or previous `id`.

假设父组件的导航栏有“前进”和“后退”按钮，用来轮流显示英雄列表中中英雄的详情。
  每次点击都会强制导航到带前一个或后一个 `id` 的 `HeroDetailComponent` 组件。

You don't want the router to remove the current `HeroDetailComponent` instance from the DOM only to re-create it for the next `id`.
That could be visibly jarring.
Better to simply re-use the same component instance and update the parameter.

你不希望路由器仅仅从 DOM 中移除当前的 `HeroDetailComponent` 实例，并且用下一个 `id` 重新创建它。
  那可能导致界面抖动。
  更好的方式是复用同一个组件实例，并更新这些参数。

Unfortunately, `ngOnInit` is only called once per component instantiation.
You need a way to detect when the route parameters change from _within the same instance_.
The observable `paramMap` property handles that beautifully.

不幸的是，`ngOnInit` 对每个实例只调用一次。
  你需要一种方式来检测*在同一个实例中*路由参数什么时候发生了变化。
  而 `params` 属性这个可观察对象（Observable）干净漂亮地处理了这种情况。

<div class="alert is-helpful">

When subscribing to an observable in a component, you almost always arrange to unsubscribe when the component is destroyed.

当在组件中订阅一个可观察对象时，你通常总是要在组件销毁时取消这个订阅。

There are a few exceptional observables where this is not necessary.
The `ActivatedRoute` observables are among the exceptions.

但是也有少数例外情况不需要取消订阅。
`ActivateRoute` 中的各种可观察对象就是属于这种情况。

The `ActivatedRoute` and its observables are insulated from the `Router` itself.
The `Router` destroys a routed component when it is no longer needed and the injected `ActivatedRoute` dies with it.

`ActivateRoute` 及其可观察对象都是由 `Router` 本身负责管理的。
`Router` 会在不再需要时销毁这个路由组件，而注入进去的 `ActivateRoute` 也随之销毁了。

Feel free to unsubscribe anyway. It is harmless and never a bad practice.

不过，你仍然可以随意取消订阅，这不会造成任何损害，而且也不是一项坏的实践。

</div>

{@a snapshot}

#### _Snapshot_: the _no-observable_ alternative

#### *Snapshot*（快照）：当不需要 Observable 时的替代品

_This_ application won't re-use the `HeroDetailComponent`.
The user always returns to the hero list to select another hero to view.
There's no way to navigate from one hero detail to another hero detail
without visiting the list component in between.
Therefore, the router creates a new `HeroDetailComponent` instance every time.

本应用不需要复用 `HeroDetailComponent`。
  用户总是会先返回英雄列表，再选择另一位英雄。
  所以，不存在从一个英雄详情导航到另一个而不用经过英雄列表的情况。
  这意味着路由器每次都会创建一个全新的 `HeroDetailComponent` 实例。

When you know for certain that a `HeroDetailComponent` instance will *never, never, ever*
be re-used, you can simplify the code with the *snapshot*.

假如你很确定这个 `HeroDetailComponent` 组件的实例*永远、永远*不会被复用，那就可以使用*快照*来简化这段代码。

The `route.snapshot` provides the initial value of the route parameter map.
You can access the parameters directly without subscribing or adding observable operators.
It's much simpler to write and read:

`route.snapshot` 提供了路由参数的初始值。
你可以通过它来直接访问参数，而不用订阅或者添加 Observable 的操作符。
这样在读写时就会更简单：

<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.2.ts" header="src/app/heroes/hero-detail/hero-detail.component.ts (ngOnInit snapshot)" region="snapshot"></code-example>

<div class="alert is-helpful">

**Remember:** you only get the _initial_ value of the parameter map with this technique.
Stick with the observable `paramMap` approach if there's even a chance that the router
could re-use the component.
This sample stays with the observable `paramMap` strategy just in case.

**记住：**，用这种技巧，你只得到了这些参数的*初始*值。
如果有可能连续多次导航到此组件，那么就该用 `paramMap` 可观察对象的方式。
这个例子中仍然使用了 `paramMap` 的可观察对象策略。

</div>

{@a nav-to-list}

### Navigating back to the list component

### 导航回列表组件

The `HeroDetailComponent` has a "Back" button wired to its `gotoHeroes` method that navigates imperatively
back to the `HeroListComponent`.

`HeroDetailComponent` 组件有一个“Back”按钮，关联到它的 `gotoHeroes` 方法，该方法会导航回 `HeroListComponent` 组件。

The router `navigate` method takes the same one-item _link parameters array_
that you can bind to a `[routerLink]` directive.
It holds the _path to the `HeroListComponent`_:

路由的 `navigate` 方法同样接受一个单条目的*链接参数数组*，你也可以把它绑定到 `[routerLink]` 指令上。
它保存着**到 `HeroListComponent` 组件的路径**：

<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.1.ts" header="src/app/heroes/hero-detail/hero-detail.component.ts (excerpt)" region="gotoHeroes"></code-example>

{@a optional-route-parameters}

#### Route Parameters: Required or optional?

#### 路由参数：必须还是可选？

Use [*route parameters*](#route-parameters) to specify a *required* parameter value *within* the route URL
as you do when navigating to the `HeroDetailComponent` in order to view the hero with *id* 15:

如果想导航到 `HeroDetailComponent` 以对 id 为 15 的英雄进行查看并编辑，就要在路由的 URL 中使用[*路由参数*](guide/router#route-parameters)来指定*必要*参数值。

<code-example format="nocode">
  localhost:4200/hero/15

</code-example>

You can also add *optional* information to a route request.
For example, when returning to the hero-detail.component.ts list from the hero detail view,
it would be nice if the viewed hero was preselected in the list.

你也能在路由请求中添加*可选*信息。
比如，当从 hero-detail.component.ts 返回到列表时，如果能自动选中刚刚查看过的英雄就好了。

<div class="lightbox">
  <img src='generated/images/guide/router/selected-hero.png' alt="Selected hero">
</div>

You'll implement this feature in a moment by including the viewed hero's `id`
in the URL as an optional parameter when returning from the `HeroDetailComponent`.

当从 `HeroDetailComponent` 返回时，你很快就会通过把正在查看的英雄的 `id` 作为可选参数包含在 URL 中来实现这个特性。

Optional information takes other forms. Search criteria are often loosely structured, e.g., `name='wind*'`.
Multiple values are common&mdash;`after='12/31/2015' & before='1/1/2017'`&mdash;in no
particular order&mdash;`before='1/1/2017' & after='12/31/2015'`&mdash; in a
variety of formats&mdash;`during='currentYear'`.

可选信息有很多种形式。搜索条件通常就不是严格结构化的，比如 `name='wind*'`；有多个值也很常见，如 `after='12/31/2015'&before='1/1/2017'`；
而且顺序无关，如 `before='1/1/2017'&after='12/31/2015'`，还可能有很多种变体格式，如 `during='currentYear'`。

These kinds of parameters don't fit easily in a URL *path*. Even if you could define a suitable URL token scheme,
doing so greatly complicates the pattern matching required to translate an incoming URL to a named route.

这么多种参数要放在 URL 的*路径*中可不容易。即使你能制定出一个合适的 URL 方案，实现起来也太复杂了，得通过模式匹配才能把 URL 翻译成命名路由。

Optional parameters are the ideal vehicle for conveying arbitrarily complex information during navigation.
Optional parameters aren't involved in pattern matching and afford flexibility of expression.

可选参数是在导航期间传送任意复杂信息的理想载体。
可选参数不涉及到模式匹配并在表达上提供了巨大的灵活性。

The router supports navigation with optional parameters as well as required route parameters.
Define _optional_ parameters in a separate object _after_ you define the required route parameters.

和必要参数一样，路由器也支持通过可选参数导航。
在你定义完必要参数之后，再通过一个*独立的对象*来定义*可选参数*。

In general, prefer a *required route parameter* when
the value is mandatory (for example, if necessary to distinguish one route path from another);
prefer an *optional parameter* when the value is optional, complex, and/or multivariate.

通常，对于强制性的值（比如用于区分两个路由路径的）使用*必备参数*；当这个值是可选的、复杂的或多值的时，使用可选参数。

{@a optionally-selecting}

#### Heroes list: optionally selecting a hero

#### 英雄列表：选定一个英雄（也可不选）

When navigating to the `HeroDetailComponent` you specified the _required_ `id` of the hero-to-edit in the
*route parameter* and made it the second item of the [_link parameters array_](#link-parameters-array).

当导航到 `HeroDetailComponent` 时，你可以在*路由参数*中指定一个所要编辑的英雄 `id`，只要把它作为[链接参数数组](guide/router#link-parameters-array)中的第二个条目就可以了。

<code-example path="router/src/app/heroes/hero-list/hero-list.component.1.html" header="src/app/heroes/hero-list/hero-list.component.html (link-parameters-array)" region="link-parameters-array"></code-example>

The router embedded the `id` value in the navigation URL because you had defined it
as a route parameter with an `:id` placeholder token in the route `path`:

路由器在导航 URL 中内嵌了 `id` 的值，这是因为你把它用一个 `:id` 占位符当做路由参数定义在了路由的 `path` 中：

<code-example path="router/src/app/heroes/heroes-routing.module.1.ts" header="src/app/heroes/heroes-routing.module.ts (hero-detail-route)" region="hero-detail-route"></code-example>

When the user clicks the back button, the `HeroDetailComponent` constructs another _link parameters array_
which it uses to navigate back to the `HeroListComponent`.

当用户点击后退按钮时，`HeroDetailComponent` 构造了另一个*链接参数数组*，可以用它导航回 `HeroListComponent`。

<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.1.ts" header="src/app/heroes/hero-detail/hero-detail.component.ts (gotoHeroes)" region="gotoHeroes"></code-example>

This array lacks a route parameter because you had no reason to send information to the `HeroListComponent`.

该数组缺少一个路由参数，这是因为你那时没有理由往 `HeroListComponent` 发送信息。

Now you have a reason. You'd like to send the id of the current hero with the navigation request so that the
`HeroListComponent` can highlight that hero in its list.
This is a _nice-to-have_ feature; the list will display perfectly well without it.

但现在有了。你要在导航请求中同时发送当前英雄的 id，以便 `HeroListComponent` 可以在列表中高亮这个英雄。
  这是一个*有更好，没有也无所谓*的特性，就算没有它，列表照样能显示得很完美。

Send the `id` with an object that contains an _optional_ `id` parameter.
For demonstration purposes, there's an extra junk parameter (`foo`) in the object that the `HeroListComponent` should ignore.
Here's the revised navigation statement:

传送一个包含*可选*`id` 参数的对象。
为了演示，这里还在对象中定义了一个没用的额外参数（`foo`），`HeroListComponent` 应该忽略它。
下面是修改过的导航语句：

<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.3.ts" header="src/app/heroes/hero-detail/hero-detail.component.ts (go to heroes)" region="gotoHeroes"></code-example>

The application still works. Clicking "back" returns to the hero list view.

该应用仍然能工作。点击“back”按钮返回英雄列表视图。

Look at the browser address bar.

注意浏览器的地址栏。

It should look something like this, depending on where you run it:

它应该是这样的，不过也取决于你在哪里运行它：

<code-example language="bash">
  localhost:4200/heroes;id=15;foo=foo

</code-example>

The `id` value appears in the URL as (`;id=15;foo=foo`), not in the URL path.
The path for the "Heroes" route doesn't have an `:id` token.

`id` 的值像这样出现在 URL 中（`;id=15;foo=foo`），但不在 URL 的路径部分。
“Heroes”路由的路径部分并没有定义 `:id`。

The optional route parameters are not separated by "?" and "&" as they would be in the URL query string.
They are **separated by semicolons ";"**
This is *matrix URL* notation&mdash;something you may not have seen before.

可选的路由参数没有使用“？”和“&”符号分隔，因为它们将用在 URL 查询字符串中。
它们是**用“;”分隔的**。
这是*矩阵 URL*标记法 —— 你以前可能从未见过。

<div class="alert is-helpful">

*Matrix URL* notation is an idea first introduced
in a [1996 proposal](http://www.w3.org/DesignIssues/MatrixURIs.html) by the founder of the web, Tim Berners-Lee.

*Matrix URL*写法首次提出是在[1996 提案](http://www.w3.org/DesignIssues/MatrixURIs.html)中，提出者是 Web 的奠基人：Tim Berners-Lee。

Although matrix notation never made it into the HTML standard, it is legal and
it became popular among browser routing systems as a way to isolate parameters
belonging to parent and child routes. The Router is such a system and provides
support for the matrix notation across browsers.

虽然 Matrix 写法未曾进入过 HTML 标准，但它是合法的。而且在浏览器的路由系统中，它作为从父路由和子路由中单独隔离出参数的方式而广受欢迎。Angular 的路由器正是这样一个路由系统，并支持跨浏览器的 Matrix 写法。

The syntax may seem strange to you but users are unlikely to notice or care
as long as the URL can be emailed and pasted into a browser address bar
as this one can.

这种语法对你来说可能有点奇怪，不过用户不会在意这一点，因为该 URL 可以正常的通过邮件发出去或粘贴到浏览器的地址栏中。

</div>

{@a route-parameters-activated-route}

### Route parameters in the *ActivatedRoute* service

### *ActivatedRoute* 服务中的路由参数

The list of heroes is unchanged. No hero row is highlighted.

英雄列表仍没有改变，没有哪个英雄列被加亮显示。

<div class="alert is-helpful">

The <live-example></live-example> *does* highlight the selected
row because it demonstrates the final state of the application which includes the steps you're *about* to cover.
At the moment this guide is describing the state of affairs *prior* to those steps.

<live-example></live-example>*高亮了*选中的行，因为它演示的是应用的最终状态，因此包含了你*即将*接触到的步骤。
此刻，本文描述的仍是那些步骤*之前*的状态。

</div>

The `HeroListComponent` isn't expecting any parameters at all and wouldn't know what to do with them.
You can change that.

`HeroListComponent` 还完全不需要任何参数，也不知道该怎么处理它们。你可以改变这一点。

Previously, when navigating from the `HeroListComponent` to the `HeroDetailComponent`,
you subscribed to the route parameter map `Observable` and made it available to the `HeroDetailComponent`
in the `ActivatedRoute` service.
You injected that service in the constructor of the `HeroDetailComponent`.

以前，当从 `HeroListComponent` 导航到 `HeroDetailComponent` 时，你通过 `ActivatedRoute` 服务订阅了路由参数这个 `Observable`，并让它能用在 `HeroDetailComponent` 中。
你把该服务注入到了 `HeroDetailComponent` 的构造函数中。

This time you'll be navigating in the opposite direction, from the `HeroDetailComponent` to the `HeroListComponent`.

这次，你要进行反向导航，从 `HeroDetailComponent` 到 `HeroListComponent`。

First you extend the router import statement to include the `ActivatedRoute` service symbol:

首先，你扩展该路由的导入语句，以包含进 `ActivatedRoute` 服务的类；

<code-example path="router/src/app/heroes/hero-list/hero-list.component.ts" header="src/app/heroes/hero-list/hero-list.component.ts (import)" region="import-router"></code-example>

Import the `switchMap` operator to perform an operation on the `Observable` of route parameter map.

导入 `switchMap` 操作符，在路由参数的 `Observable` 对象上执行操作。

<code-example path="router/src/app/heroes/hero-list/hero-list.component.ts" header="src/app/heroes/hero-list/hero-list.component.ts (rxjs imports)" region="rxjs-imports"></code-example>

Then you inject the `ActivatedRoute` in the `HeroListComponent` constructor.

接着，你注入 `ActivatedRoute` 到 `HeroListComponent` 的构造函数中。

<code-example path="router/src/app/heroes/hero-list/hero-list.component.ts" header="src/app/heroes/hero-list/hero-list.component.ts (constructor and ngOnInit)" region="ctor"></code-example>

The `ActivatedRoute.paramMap` property is an `Observable` map of route parameters. The `paramMap` emits a new map of values that includes `id`
when the user navigates to the component. In `ngOnInit` you subscribe to those values, set the `selectedId`, and get the heroes.

ActivatedRoute.paramMap 属性是一个路由参数的可观察对象。当用户导航到这个组件时，paramMap 会发射一个新值，其中包含 `id`。
在 ngOnInit 中，你订阅了这些值，设置到 selectedId，并获取英雄数据。

Update the template with a [class binding](guide/template-syntax#class-binding).
The binding adds the `selected` CSS class when the comparison returns `true` and removes it when `false`.
Look for it within the repeated `<li>` tag as shown here:

用 [CSS 类绑定](guide/template-syntax#class-binding)更新模板，把它绑定到 `isSelected` 方法上。
如果该方法返回 `true`，此绑定就会添加 CSS 类 `selected`，否则就移除它。
在 `<li>` 标记中找到它，就像这样：

<code-example path="router/src/app/heroes/hero-list/hero-list.component.html" header="src/app/heroes/hero-list/hero-list.component.html"></code-example>

Add some styles to apply when the list item is selected.

当选中列表条目时，要添加一些样式。

<code-example path="router/src/app/heroes/hero-list/hero-list.component.css" region="selected" header="src/app/heroes/hero-list/hero-list.component.css"></code-example>

When the user navigates from the heroes list to the "Magneta" hero and back, "Magneta" appears selected:

当用户从英雄列表导航到英雄“Magneta”并返回时，“Magneta”看起来是选中的：

<div class="lightbox">
  <img src='generated/images/guide/router/selected-hero.png' alt="Selected List">
</div>

The optional `foo` route parameter is harmless and continues to be ignored.

这儿可选的 `foo` 路由参数人畜无害，并继续被忽略。

### Adding routable animations

### 添加路由动画

{@a route-animation}

#### Adding animations to the routed component

#### 为路由组件添加动画

The heroes feature module is almost complete, but what is a feature without some smooth transitions?

这个“英雄”特性模块就要完成了，但这个特性还没有平滑的转场效果。

This section shows you how to add some [animations](guide/animations) to the `HeroDetailComponent`.

在这一节，你将为*英雄详情*组件添加一些[动画](guide/animations)。

First import the `BrowserAnimationsModule` and add it to the `imports` array:

首先导入 `BrowserAnimationsModule`，并添加到 `imports` 数组中：

<code-example path="router/src/app/app.module.ts" header="src/app/app.module.ts (animations-module)" region="animations-module"></code-example>

Next, add a `data` object to the routes for `HeroListComponent` and `HeroDetailComponent`. Transitions are based on `states` and you'll use the `animation` data from the route to provide a named animation `state` for the transitions.

接下来，为指向 `HeroListComponent` 和 `HeroDetailComponent` 的路由定义添加一个 `data` 对象。
转场是基于 `states` 的，你将使用来自路由的 `animation` 数据为转场提供一个有名字的动画 `state`。

<code-example path="router/src/app/heroes/heroes-routing.module.2.ts" header="src/app/heroes/heroes-routing.module.ts (animation data)"></code-example>


Create an `animations.ts` file in the root `src/app/` folder. The contents look like this:

在根目录 `src/app/` 下创建一个 `animations.ts`。内容如下：

<code-example path="router/src/app/animations.ts" header="src/app/animations.ts (excerpt)"></code-example>


This file does the following:

该文件做了如下工作：

* Imports the animation symbols that build the animation triggers, control state, and manage transitions between states.

   导入动画符号以构建动画触发器、控制状态并管理状态之间的过渡。

* Exports a constant named `slideInAnimation` set to an animation trigger named *`routeAnimation`*;

   导出了一个名叫 `slideInAnimation` 的常量，并把它设置为一个名叫*`routeAnimation` 的动画触发器。

* Defines one *transition* when switching back and forth from the `heroes` and `hero` routes to ease the component in from the left of the screen as it enters the application view (`:enter`), the other to animate the component to the right as it leaves the application view (`:leave`).

  定义一个*转场动画*，当在 `heroes` 和 `hero` 路由之间来回切换时，如果进入（`:enter`）应用视图则让组件从屏幕的左侧滑入，如果离开（`:leave`）应用视图则让组件从右侧划出。

You could also create more transitions for other routes. This trigger is sufficient for the current milestone.

你还可以为其它路由组件用不同的转场效果创建更多触发器。现在这个触发器已经足够当前的里程碑用了。

Back in the `AppComponent`, import the `RouterOutlet` token from the `@angular/router` package and the `slideInAnimation` from
`'./animations.ts`.

回到 `AppComponent`，从 `@angular/router` 中导入 `RouterOutlet` 令牌，并从 `'./animations.ts` 中导入 `slideInDownAnimation`。

Add an `animations` array to the `@Component` metadata's that contains the `slideInAnimation`.

把一个包含 `slideInDownAnimation` 的 `animations` 数组添加到 `@Component` 的元数据中。

<code-example path="router/src/app/app.component.2.ts" header="src/app/app.component.ts (animations)" region="animation-imports"></code-example>

In order to use the routable animations, you'll need to wrap the `RouterOutlet` inside an element. You'll
use the `@routeAnimation` trigger and bind it to the element.

为了使用路由动画，你需要把 `RouterOutlet` 包装到一个元素中。你要把 `@routeAnimation` 触发器绑定到该元素上。

For the `@routeAnimation` transitions to key off states, you'll need to provide it with the `data` from the `ActivatedRoute`. The `RouterOutlet` is exposed as an `outlet` template variable, so you bind a reference to the router outlet. A variable of `routerOutlet` is an ideal choice.

为了把 `@routeAnimation` 转场转场到指定的状态，你需要从 `ActivatedRoute` 的 `data` 中提供它。
`RouterOutlet` 导出成了一个模板变量 `outlet`，这样你就可以绑定一个到路由出口的引用了。给这个变量取名做 `routerOutlet` 是一个理想的选择。

<code-example path="router/src/app/app.component.2.html" header="src/app/app.component.html (router outlet)"></code-example>

The `@routeAnimation` property is bound to the `getAnimationData` with the provided `routerOutlet` reference, so you'll need to define that function in the `AppComponent`. The `getAnimationData` function returns the animation property from the `data` provided through the `ActivatedRoute`. The `animation` property matches the `transition` names you used in the `slideInAnimation` defined in `animations.ts`.

`@routeAnimation` 属性使用所提供的 `routerOutlet` 引用来绑定到 `getAnimationData`，因此你需要在 `AppComponent` 中定义那个函数。`getAnimationData` 函数会根据 `ActivatedRoute` 所提供的 `data` 对象返回动画的属性。`animation` 属性会根据你在 `animations.ts` 中定义 `slideInAnimation` 时使用的 `transition` 名称进行匹配。

<code-example path="router/src/app/app.component.2.ts" header="src/app/app.component.ts (router outlet)" region="function-binding"></code-example>

When switching between the two routes, the `HeroDetailComponent` and `HeroListComponent` will ease in from the left when routed to and will slide to the right when navigating away.

如果在两个路由之间切换，导航进来时，`HeroDetailComponent` 和 `HeroListComponent` 会从左侧滑入；导航离开时将会从右侧划出。

{@a milestone-3-wrap-up}

### Milestone 3 wrap up

### 里程碑 3 的总结

You've learned how to do the following:

你学到了如何：

* Organize the app into *feature areas*.

   把应用组织成*特性区*

* Navigate imperatively from one component to another.

   命令式的从一个组件导航到另一个

* Pass information along in route parameters and subscribe to them in the component.

   通过路由参数传递信息，并在组件中订阅它们

* Import the feature area NgModule into the `AppModule`.

   把这个特性分区模块导入根模块 `AppModule`

* Applying routable animations based on the page.

   把动画应用到路由组件上

After these changes, the folder structure looks like this:

做完这些修改之后，目录结构是这样的：

<div class='filetree'>

  <div class='file'>

    angular-router-sample
  </div>

  <div class='children'>

    <div class='file'>
      src
    </div>

    <div class='children'>

    <div class='file'>

      app

    </div>

      <div class='children'>

      <div class='file'>

        crisis-list

      </div>

          <div class='children'>

            <div class='file'>
              crisis-list.component.css
            </div>

            <div class='file'>
              crisis-list.component.html
            </div>

            <div class='file'>
              crisis-list.component.ts
            </div>

          </div>

        <div class='file'>

          heroes

        </div>

        <div class='children'>

          <div class='file'>

hero-detail
          </div>

            <div class='children'>

              <div class='file'>
                hero-detail.component.css
              </div>

              <div class='file'>
                hero-detail.component.html
              </div>

              <div class='file'>            hero-detail.component.ts

          </div>

            </div>

          <div class='file'>

hero-list
          </div>

            <div class='children'>

              <div class='file'>
                hero-list.component.css
              </div>

              <div class='file'>
                hero-list.component.html
              </div>

              <div class='file'>            hero-list.component.ts

          </div></div>

          <div class='file'>

            hero.service.ts

          </div>

          <div class='file'>
            hero.ts
          </div>

          <div class='file'>
            heroes-routing.module.ts
          </div>

          <div class='file'>

            heroes.module.ts

          </div>

          <div class='file'>

            mock-heroes.ts
          </div>

        </div>

        <div class='file'>
          page-not-found
        </div>

        <div class='children'>

          <div class='file'>

            page-not-found.component.css

          </div>

          <div class='file'>

            page-not-found.component.html

          </div>

          <div class='file'>

            page-not-found.component.ts

          </div>

        </div>

      </div>

      <div class='file'>
        animations.ts
      </div>

      <div class='file'>
        app.component.css
      </div>

      <div class='file'>
        app.component.html
      </div>

        <div class='file'>

          app.component.ts

        </div>

        <div class='file'>

          app.module.ts

        </div>

        <div class='file'>

          app-routing.module.ts

        </div>

        <div class='file'>

          main.ts


      </div>

      <div class='file'>

        message.service.ts

      </div>

      <div class='file'>

        index.html

      </div>

      <div class='file'>

        styles.css

      </div>

      <div class='file'>

        tsconfig.json

      </div>

    </div>

    <div class='file'>

      node_modules ...

    </div>

    <div class='file'>

      package.json

    </div>

  </div>

</div>

Here are the relevant files for this version of the sample application.

这里是当前版本的范例程序相关文件。

<code-tabs>

  <code-pane header="animations.ts" path="router/src/app/animations.ts">

  </code-pane>

  <code-pane header="app.component.html" path="router/src/app/app.component.2.html">

  </code-pane>

  <code-pane header="app.component.ts" path="router/src/app/app.component.2.ts">

  </code-pane>

  <code-pane header="app.module.ts" path="router/src/app/app.module.3.ts">

  </code-pane>

  <code-pane header="app-routing.module.ts" path="router/src/app/app-routing.module.2.ts" region="milestone3">

  </code-pane>

  <code-pane header="hero-list.component.css" path="router/src/app/heroes/hero-list/hero-list.component.css">

  </code-pane>

  <code-pane header="hero-list.component.html" path="router/src/app/heroes/hero-list/hero-list.component.html">

  </code-pane>

  <code-pane header="hero-list.component.ts" path="router/src/app/heroes/hero-list/hero-list.component.ts">

  </code-pane>

  <code-pane header="hero-detail.component.html" path="router/src/app/heroes/hero-detail/hero-detail.component.html">

  </code-pane>

  <code-pane header="hero-detail.component.ts" path="router/src/app/heroes/hero-detail/hero-detail.component.3.ts">

  </code-pane>

  <code-pane header="hero.service.ts" path="router/src/app/heroes/hero.service.ts">

  </code-pane>

  <code-pane header="heroes.module.ts" path="router/src/app/heroes/heroes.module.ts">

  </code-pane>

  <code-pane header="heroes-routing.module.ts" path="router/src/app/heroes/heroes-routing.module.2.ts">

  </code-pane>

  <code-pane header="message.service.ts" path="router/src/app/message.service.ts">

  </code-pane>

</code-tabs>

{@a milestone-4}

## Milestone 4: Crisis center feature

## 里程碑 4：危机中心

It's time to add real features to the app's current placeholder crisis center.

是时候往该应用的危机中心（现在是占位符）中添加一些真实的特性了。

Begin by imitating the heroes feature:

先从模仿“英雄管理”中的特性开始：

* Create a `crisis-center` subfolder in the `src/app` folder.

  在 `src/app` 目录下创建一个 `crisis-center` 子目录。

* Copy the files and folders from `app/heroes` into the new `crisis-center` folder.

   把 `app/heroes` 中的文件和目录复制到新的 `crisis-center` 文件夹中。

* In the new files, change every mention of "hero" to "crisis", and "heroes" to "crises".

  在这些新建的文件中，把每个 "hero" 都改成 "crisis"，每个 "heroes" 都改成 "crises"。

* Rename the NgModule files to `crisis-center.module.ts` and `crisis-center-routing.module.ts`.

  把这些 NgModule 文件改名为 `crisis-center.module.ts` 和 `crisis-center-routing.module.ts`。

You'll use mock crises instead of mock heroes:

你还要用模拟的危机列表替换模拟的英雄列表：

<code-example path="router/src/app/crisis-center/mock-crises.ts" header="src/app/crisis-center/mock-crises.ts"></code-example>


The resulting crisis center is a foundation for introducing a new concept&mdash;**child routing**.
You can leave *Heroes* in its current state as a contrast with the *Crisis Center*
and decide later if the differences are worthwhile.

最终的危机中心可以作为引入**子路由**这个新概念的基础。
你可以把*英雄管理*保持在当前状态，以便和*危机中心*进行对比，以后再根据这些差异是否有价值来决定后续行动。

<div class="alert is-helpful">

In keeping with the
<a href="https://blog.8thlight.com/uncle-bob/2014/05/08/SingleReponsibilityPrinciple.html" title="Separation of Concerns">*Separation of Concerns* principle</a>,
changes to the *Crisis Center* won't affect the `AppModule` or
any other feature's component.

遵循<a href="https://blog.8thlight.com/uncle-bob/2014/05/08/SingleReponsibilityPrinciple.html" target="_blank" title="Separation of Concerns">*关注点分离（Separation of Concerns）*原则</a>，
对*危机中心*的修改不会影响 `AppModule` 或其它特性模块中的组件。

</div>

{@a crisis-child-routes}

### A crisis center with child routes

### 带有子路由的危机中心

This section shows you how to organize the crisis center
to conform to the following recommended pattern for Angular applications:

本节会展示如何组织危机中心，来满足 Angular 应用所推荐的模式：

* Each feature area resides in its own folder.

   把每个特性放在自己的目录中。

* Each feature has its own Angular feature module.

   每个特性都有自己的 Angular 特性模块。

* Each area has its own area root component.

   每个特性区都有自己的根组件。

* Each area root component has its own router outlet and child routes.

   每个特性区的根组件中都有自己的路由出口及其子路由。

* Feature area routes rarely (if ever) cross with routes of other features.

   特性区的路由很少（或完全不）与其它特性区的路由交叉。

If your app had many feature areas, the app component trees might look like this:

如果你还有更多特性区，它们的组件树是这样的：

<div class="lightbox">
  <img src='generated/images/guide/router/component-tree.png' alt="Component Tree">
</div>

{@a child-routing-component}

### Child routing component

### 子路由组件

Generate a `CrisisCenter` component in the `crisis-center` folder:

在 `crisis-center` 目录下生成一个 `CrisisCenter` 组件：

<code-example language="none" class="code-shell">
  ng generate component crisis-center/crisis-center
</code-example>

Update the component template to look like this:

把组件模板修改成这样：

<code-example path="router/src/app/crisis-center/crisis-center/crisis-center.component.html" header="src/app/crisis-center/crisis-center/crisis-center.component.html"></code-example>

The `CrisisCenterComponent` has the following in common with the `AppComponent`:

`CrisisCenterComponent` 和 `AppComponent` 有下列共同点：

* It is the *root* of the crisis center area,
just as `AppComponent` is the root of the entire application.

   它是危机中心特性区的*根*，正如 `AppComponent` 是整个应用的根。

* It is a *shell* for the crisis management feature area,
just as the `AppComponent` is a shell to manage the high-level workflow.

   它是危机管理特性区的*壳*，正如 `AppComponent` 是管理高层工作流的壳。

Like most shells, the `CrisisCenterComponent` class is very simple, simpler even than `AppComponent`:
it has no business logic, and its template has no links, just a title and
`<router-outlet>` for the crisis center child component.

就像大多数的壳一样，`CrisisCenterComponent` 类也非常简单，甚至比 `AppComponent` 更简单：
它没有业务逻辑，它的模板中没有链接，只有一个标题和用于放置危机中心的子组件的 `<router-outlet>`。

{@a child-route-config}

### Child route configuration

### 子路由配置

As a host page for the "Crisis Center" feature, generate a `CrisisCenterHome` component in the `crisis-center` folder.

在 `crisis-center` 目录下生成一个 `CrisisCenterHome` 组件，作为 "危机中心" 特性的宿主页面。

<code-example language="none" class="code-shell">
  ng generate component crisis-center/crisis-center-home
</code-example>

Update the template with a welcome message to the `Crisis Center`.

用一条欢迎信息修改 `Crisis Center` 中的模板。

<code-example path="router/src/app/crisis-center/crisis-center-home/crisis-center-home.component.html" header="src/app/crisis-center/crisis-center-home/crisis-center-home.component.html"></code-example>

Update the `crisis-center-routing.module.ts` you renamed after copying it from `heroes-routing.module.ts` file.
This time, you define **child routes** *within* the parent `crisis-center` route.

把 `heroes-routing.module.ts` 文件复制过来，改名为 `crisis-center-routing.module.ts`，并修改它。
这次你要把**子路由**定义在父路由 `crisis-center` 中。

<code-example path="router/src/app/crisis-center/crisis-center-routing.module.1.ts" header="src/app/crisis-center/crisis-center-routing.module.ts (Routes)" region="routes"></code-example>

Notice that the parent `crisis-center` route has a `children` property
with a single route containing the `CrisisListComponent`. The `CrisisListComponent` route
also has a `children` array with two routes.

注意，父路由 `crisis-center` 有一个 `children` 属性，它有一个包含 `CrisisListComponent` 的路由。
`CrisisListModule` 路由还有一个带两个路由的 `children` 数组。

These two routes navigate to the crisis center child components,
`CrisisCenterHomeComponent` and `CrisisDetailComponent`, respectively.

这两个路由导航到了*危机中心*的两个子组件：`CrisisCenterHomeComponent` 和 `CrisisDetailComponent`。

There are *important differences* in the way the router treats these _child routes_.

对这些路由的处理中有一些*重要的不同*。

The router displays the components of these routes in the `RouterOutlet`
of the `CrisisCenterComponent`, not in the `RouterOutlet` of the `AppComponent` shell.

路由器会把这些路由对应的组件放在 `CrisisCenterComponent` 的 `RouterOutlet` 中，而不是 `AppComponent` 壳组件中的。

The `CrisisListComponent` contains the crisis list and a `RouterOutlet` to
display the `Crisis Center Home` and `Crisis Detail` route components.

`CrisisListComponent` 包含危机列表和一个 `RouterOutlet`，用以显示 `Crisis Center Home` 和 `Crisis Detail` 这两个路由组件。

The `Crisis Detail` route is a child of the `Crisis List`. The router [reuses components](#reuse)
by default, so the `Crisis Detail` component will be re-used as you select different crises.
In contrast, back in the `Hero Detail` route, [the component was recreated](#snapshot-the-no-observable-alternative) each time you selected a different hero from the list of heroes.

`Crisis Detail` 路由是 `Crisis List` 的子路由。由于路由器默认会[复用组件](#reuse)，因此当你选择了另一个危机时，`CrisisDetailComponent` 会被复用。  
作为对比，回头看看 `Hero Detail` 路由，每当你从列表中选择了不同的英雄时，[都会重新创建该组件](#snapshot-the-no-observable-alternative)。

At the top level, paths that begin with `/` refer to the root of the application.
But child routes *extend* the path of the parent route.
With each step down the route tree,
you add a slash followed by the route path, unless the path is _empty_.

在顶级，以 `/` 开头的路径指向的总是应用的根。
但这里是子路由。
它们是在父路由路径的基础上做出的扩展。
在路由树中每深入一步，你就会在该路由的路径上添加一个斜线 `/`（除非该路由的路径是*空的*）。

Apply that logic to navigation within the crisis center for which the parent path is `/crisis-center`.

如果把该逻辑应用到危机中心中的导航，那么父路径就是 `/crisis-center`。

* To navigate to the `CrisisCenterHomeComponent`, the full URL is `/crisis-center` (`/crisis-center` + `''` + `''`).

   要导航到 `CrisisCenterHomeComponent`，完整的 URL 是 `/crisis-center` (`/crisis-center` + `''` + `''`)。

* To navigate to the `CrisisDetailComponent` for a crisis with `id=2`, the full URL is
`/crisis-center/2` (`/crisis-center` + `''` +  `'/2'`).

   要导航到 `CrisisDetailComponent` 以展示 `id=2` 的危机，完整的 URL 是 `/crisis-center/2` (`/crisis-center` + `''` + `'/2'`)。

The absolute URL for the latter example, including the `localhost` origin, is

本例子中包含站点部分的绝对 URL，就是：

<code-example>
  localhost:4200/crisis-center/2

</code-example>

Here's the complete `crisis-center-routing.module.ts` file with its imports.

这里是完整的 `crisis-center.routing.ts` 及其导入语句。

<code-example path="router/src/app/crisis-center/crisis-center-routing.module.1.ts" header="src/app/crisis-center/crisis-center-routing.module.ts (excerpt)"></code-example>

{@a import-crisis-module}

### Import crisis center module into the *AppModule* routes

### 把危机中心模块导入到 `AppModule` 的路由中

As with the `HeroesModule`, you must add the `CrisisCenterModule` to the `imports` array of the `AppModule`
_before_ the `AppRoutingModule`:

就像 `HeroesModule` 模块中一样，你必须把 `CrisisCenterModule` 添加到 `AppModule` 的 `imports` 数组中，就在 `AppRoutingModule` 前面：

<code-tabs>

  <code-pane path="router/src/app/crisis-center/crisis-center.module.ts"header="src/app/crisis-center/crisis-center.module.ts">

  </code-pane>

  <code-pane path="router/src/app/app.module.4.ts" header="src/app/app.module.ts (import CrisisCenterModule)" region="crisis-center-module">

  </code-pane>

</code-tabs>

Remove the initial crisis center route from the `app-routing.module.ts`.
The feature routes are now provided by the `HeroesModule` and the `CrisisCenter` modules.

从 `app.routing.ts` 中移除危机中心的初始路由。
这些特性路由现在是由 `HeroesModule` 和 `CrisisCenter` 特性模块提供的。

The `app-routing.module.ts` file retains the top-level application routes such as the default and wildcard routes.

`app-routing.module.ts` 文件中只有应用的顶级路由，比如默认路由和通配符路由。

<code-example path="router/src/app/app-routing.module.3.ts" header="src/app/app-routing.module.ts (v3)" region="v3"></code-example>

{@a relative-navigation}

### Relative navigation

### 相对导航

While building out the crisis center feature, you navigated to the
crisis detail route using an **absolute path** that begins with a _slash_.

虽然构建出了危机中心特性区，你却仍在使用以斜杠开头的**绝对路径**来导航到危机详情的路由。

The router matches such _absolute_ paths to routes starting from the top of the route configuration.

路由器会从路由配置的顶层来匹配像这样的*绝对路径*。

You could continue to use absolute paths like this to navigate inside the *Crisis Center*
feature, but that pins the links to the parent routing structure.
If you changed the parent `/crisis-center` path, you would have to change the link parameters array.

你固然可以继续像*危机中心*特性区一样使用绝对路径，但是那样会把链接钉死在特定的父路由结构上。
如果你修改了父路径 `/crisis-center`，那就不得不修改每一个链接参数数组。

You can free the links from this dependency by defining paths that are **relative** to the current URL segment.
Navigation _within_ the feature area remains intact even if you change the parent route path to the feature.

通过改成定义*相对于*当前 URL 的路径，你可以把链接从这种依赖中解放出来。
当你修改了该特性区的父路由路径时，该特性区*内部*的导航仍然完好无损。

Here's an example:

例子如下：

<div class="alert is-helpful">

The router supports directory-like syntax in a _link parameters list_ to help guide route name lookup:

路由器支持在*链接参数数组*中使用“目录式”语法来为查询路由名提供帮助：

`./` or `no leading slash` is relative to the current level.

`./` 或 ` 无前导斜线 ` 形式是相对于当前级别的。

`../` to go up one level in the route path.

`../` 会回到当前路由路径的上一级。

You can combine relative navigation syntax with an ancestor path.
If you must navigate to a sibling route, you could use the `../<sibling>` convention to go up
one level, then over and down the sibling route path.

你可以把相对导航语法和一个祖先路径组合起来用。
如果不得不导航到一个兄弟路由，你可以用 `../<sibling>` 来回到上一级，然后进入兄弟路由路径中。

</div>

To navigate a relative path with the `Router.navigate` method, you must supply the `ActivatedRoute`
to give the router knowledge of where you are in the current route tree.

用 `Router.navigate` 方法导航到相对路径时，你必须提供当前的 `ActivatedRoute`，来让路由器知道你现在位于路由树中的什么位置。

After the _link parameters array_, add an object with a `relativeTo` property set to the `ActivatedRoute`.
The router then calculates the target URL based on the active route's location.

在*链接参数数组*后面，添加一个带有 `relativeTo` 属性的对象，并把它设置为当前的 `ActivatedRoute`。
这样路由器就会基于当前激活路由的位置来计算出目标 URL。

<div class="alert is-helpful">

**Always** specify the complete _absolute_ path when calling router's `navigateByUrl` method.

当调用路由器的 `navigateByUrl` 时，**总是**要指定完整的*绝对路径*。

</div>

{@a nav-to-crisis}

### Navigate to crisis list with a relative URL

### 使用相对 URL 导航到危机列表

You've already injected the `ActivatedRoute` that you need to compose the relative navigation path.

你已经注入过了 `ActivatedRoute`，你需要把它来和相对导航路径组合在一起。

When using a `RouterLink` to navigate instead of the `Router` service, you'd use the _same_
link parameters array, but you wouldn't provide the object with the `relativeTo` property.
The `ActivatedRoute` is implicit in a `RouterLink` directive.

如果用 `RouterLink` 来代替 `Router` 服务进行导航，就要使用*相同*的链接参数数组，不过不再需要提供 `relativeTo` 属性。
`ActivatedRoute` 已经隐含在了 `RouterLink` 指令中。

Update the `gotoCrises` method of the `CrisisDetailComponent` to navigate back to the *Crisis Center* list using relative path navigation.

修改 `CrisisDetailComponent` 的 `gotoCrises` 方法，来使用相对路径返回*危机中心*列表。

<code-example path="router/src/app/crisis-center/crisis-detail/crisis-detail.component.ts" header="src/app/crisis-center/crisis-detail/crisis-detail.component.ts (relative navigation)" region="gotoCrises-navigate"></code-example>

Notice that the path goes up a level using the `../` syntax.
If the current crisis `id` is `3`, the resulting path back to the crisis list is  `/crisis-center/;id=3;foo=foo`.

注意这个路径使用了 `../` 语法返回上一级。
如果当前危机的 `id` 是 `3`，那么最终返回到的路径就是 `/crisis-center/;id=3;foo=foo`。

{@a named-outlets}

### Displaying multiple routes in named outlets

### 用命名出口（outlet）显示多重路由

You decide to give users a way to contact the crisis center.
When a user clicks a "Contact" button, you want to display a message in a popup view.

你决定给用户提供一种方式来联系危机中心。
当用户点击“Contact”按钮时，你要在一个弹出框中显示一条消息。

The popup should stay open, even when switching between pages in the application, until the user closes it
by sending the message or canceling.
Clearly you can't put the popup in the same outlet as the other pages.

即使在应用中的不同页面之间切换，这个弹出框也应该始终保持打开状态，直到用户发送了消息或者手动取消。
显然，你不能把这个弹出框跟其它放到页面放到同一个路由出口中。

Until now, you've defined a single outlet and you've nested child routes
under that outlet to group routes together.
The router only supports one primary _unnamed_ outlet per template.

迄今为止，你只定义过单路由出口，并且在其中嵌套了子路由以便对路由分组。
在每个模板中，路由器只能支持一个*无名*主路由出口。

A template can also have any number of _named_ outlets.
Each named outlet has its own set of routes with their own components.
Multiple outlets can be displaying different content, determined by different routes, all at the same time.

模板还可以有多个*命名的*路由出口。
每个命名出口都自己有一组带组件的路由。
多重出口可以在同一时间根据不同的路由来显示不同的内容。

Add an outlet named "popup" in the `AppComponent`, directly below the unnamed outlet.

在 `AppComponent` 中添加一个名叫“popup”的出口，就在无名出口的下方。

<code-example path="router/src/app/app.component.4.html" header="src/app/app.component.html (outlets)" region="outlets"></code-example>

That's where a popup will go, once you learn how to route a popup component to it.

一旦你学会了如何把一个弹出框组件路由到该出口，那里就是将会出现弹出框的地方。

{@a secondary-routes}

#### Secondary routes

#### 第二路由

Named outlets are the targets of  _secondary routes_.

命名出口是*第二路由*的目标。

Secondary routes look like primary routes and you configure them the same way.
They differ in a few key respects.

第二路由很像主路由，配置方式也一样。它们只有一些关键的不同点：

* They are independent of each other.

   它们彼此互不依赖。

* They work in combination with other routes.

   它们与其它路由组合使用。

* They are displayed in named outlets.

   它们显示在命名出口中。

Generate a new component to compose the message.

生成一个新的组件来组合这个消息。

<code-example language="none" class="code-shell">
  ng generate component compose-message
</code-example>

It displays a simple form with a header, an input box for the message,
and two buttons, "Send" and "Cancel".

它显示一个简单的表单，包括一个头、一个消息输入框和两个按钮：“Send”和“Cancel”。

<div class="lightbox">
  <img src='generated/images/guide/router/contact-popup.png' alt="Contact popup">
</div>

Here's the component, its template and styles:

下面是该组件及其模板和样式：

<code-tabs>

  <code-pane header="src/app/compose-message/compose-message.component.css" path="router/src/app/compose-message/compose-message.component.css">

  </code-pane>

  <code-pane header="src/app/compose-message/compose-message.component.html" path="router/src/app/compose-message/compose-message.component.html">

  </code-pane>

  <code-pane header="src/app/compose-message/compose-message.component.ts" path="router/src/app/compose-message/compose-message.component.ts">

  </code-pane>

</code-tabs>

It looks about the same as any other component you've seen in this guide.
There are two noteworthy differences.

它看起来几乎和你以前见过其它组件一样，但有两个值得注意的区别。

Note that the `send()` method simulates latency by waiting a second before "sending" the message and closing the popup.

注意，`send()` 方法在发送消息和关闭弹出框之前通过等待模拟了一秒钟的延迟。

The `closePopup()` method closes the popup view by navigating to the popup outlet with a `null`.
That's a peculiarity covered [below](#clear-secondary-routes).


`closePopup()` 方法用把 `popup` 出口导航到 `null` 的方式关闭了弹出框。
这个奇怪的用法在[稍后的部分](guide/router#clear-secondary-routes)有讲解。

{@a add-secondary-route}

#### Add a secondary route

#### 添加第二路由

Open the `AppRoutingModule` and add a new `compose` route to the `appRoutes`.

打开 `AppRoutingModule`，并把一个新的 `compose` 路由添加到 `appRoutes` 中。

<code-example path="router/src/app/app-routing.module.3.ts" header="src/app/app-routing.module.ts (compose route)" region="compose"></code-example>

The `path` and `component` properties should be familiar.
There's a new property, `outlet`, set to `'popup'`.
This route now targets the popup outlet and the `ComposeMessageComponent` will display there.

对 `path` 和 `component` 属性应该很熟悉了吧。
注意这个新的属性 `outlet` 被设置成了 `'popup'`。
这个路由现在指向了 `popup` 出口，而 `ComposeMessageComponent` 也将显示在那里。

The user needs a way to open the popup.
Open the `AppComponent` and add a "Contact" link.

用户需要某种途径来打开这个弹出框。
打开 `AppComponent`，并添加一个“Contact”链接。

<code-example path="router/src/app/app.component.4.html" header="src/app/app.component.html (contact-link)" region="contact-link"></code-example>

Although the `compose` route is pinned to the "popup" outlet, that's not sufficient for wiring the route to a `RouterLink` directive.
You have to specify the named outlet in a _link parameters array_ and bind it to the `RouterLink` with a property binding.

虽然 `compose` 路由被钉死在了 `popup` 出口上，但这仍然不足以向 `RouterLink` 指令表明要加载该路由。
你还要在*链接参数数组*中指定这个命名出口，并通过属性绑定的形式把它绑定到 `RouterLink` 上。

The _link parameters array_ contains an object with a single `outlets` property whose value
is another object keyed by one (or more) outlet names.
In this case there is only the "popup" outlet property and its value is another _link parameters array_ that specifies the `compose` route.

*链接参数数组*包含一个只有一个 `outlets` 属性的对象，它的值是另一个对象，这个对象以一个或多个路由的出口名作为属性名。
在这里，它只有一个出口名“popup”，它的值则是另一个*链接参数数组*，用于指定 `compose` 路由。

You are in effect saying, _when the user clicks this link, display the component associated with the `compose` route in the `popup` outlet_.

意思是，当用户点击此链接时，在路由出口 `popup` 中显示与 `compose` 路由相关联的组件。

<div class="alert is-helpful">

This `outlets` object within an outer object was completely unnecessary
when there was only one route and one _unnamed_ outlet to think about.

当只需要考虑一个路由和一个*无名*出口时，外部对象中的这个 `outlets` 对象是完全不必要的。

The router assumed that your route specification targeted the _unnamed_ primary outlet
and created these objects for you.

路由器假设这个路由指向了*无名*的主出口，并为你创建这些对象。

Routing to a named outlet has revealed a previously hidden router truth:
you can target multiple outlets with multiple routes in the same `RouterLink` directive.

路由到一个命名出口就会揭示一个以前被隐藏的真相：
你可以在同一个 `RouterLink` 指令中为多个路由出口指定多个路由。

You're not actually doing that here.
But to target a named outlet, you must use the richer, more verbose syntax.

这里你实际上没能这样做。要想指向命名出口，你就得使用一种更强大也更啰嗦的语法。

</div>

{@a secondary-route-navigation}

#### Secondary route navigation: merging routes during navigation

#### 第二路由导航：在导航期间合并路由

Navigate to the _Crisis Center_ and click "Contact".
you should see something like the following URL in the browser address bar.

导航到*危机中心*并点击“Contact”，你将会在浏览器的地址栏看到如下 URL：

<code-example>
  http://.../crisis-center(popup:compose)

</code-example>

The interesting part of the URL follows the `...`:

这个 URL 中有意思的部分是 `...` 后面的这些：

* The `crisis-center` is the primary navigation.

   `crisis-center` 是主导航。

* Parentheses surround the secondary route.

   圆括号包裹的部分是第二路由。

* The secondary route consists of an outlet name (`popup`), a `colon` separator, and the secondary route path (`compose`).

   第二路由包括一个出口名称（`popup`）、一个冒号分隔符和第二路由的路径（`compose`）。

Click the _Heroes_ link and look at the URL again.

点击 *Heroes* 链接，并再次查看 URL：

<code-example>
  http://.../heroes(popup:compose)
</code-example>

The primary navigation part has changed; the secondary route is the same.

主导航的部分变化了，而第二路由没有变。

The router is keeping track of two separate branches in a navigation tree and generating a representation of that tree in the URL.

路由器在导航树中对两个独立的分支保持追踪，并在 URL 中对这棵树进行表达。

You can add many more outlets and routes, at the top level and in nested levels, creating a navigation tree with many branches.
The router will generate the URL to go with it.

你还可以添加更多出口和更多路由（无论是在顶层还是在嵌套的子层）来创建一个带有多个分支的导航树。
路由器将会生成相应的 URL。

You can tell the router to navigate an entire tree at once by filling out the `outlets` object mentioned above.
Then pass that object inside a _link parameters array_  to the `router.navigate` method.

通过像前面那样填充 `outlets` 对象，你可以告诉路由器立即导航到一棵完整的树。
然后把这个对象通过一个*链接参数数组*传给 `router.navigate` 方法。

Experiment with these possibilities at your leisure.

有空的时候你可以自行试验这些可能性。

{@a clear-secondary-routes}

#### Clearing secondary routes

#### 清除第二路由

As you've learned, a component in an outlet persists until you navigate away to a new component.
Secondary outlets are no different in this regard.

正如你刚刚学到的，除非导航到新的组件，否则路由出口中的组件会始终存在。
这里涉及到的第二出口也同样如此。

Each secondary outlet has its own navigation, independent of the navigation driving the primary outlet.
Changing a current route that displays in the primary outlet has no effect on the popup outlet.
That's why the popup stays visible as you navigate among the crises and heroes.

每个第二出口都有自己独立的导航，跟主出口的导航彼此独立。
修改主出口中的当前路由并不会影响到 `popup` 出口中的。
这就是为什么在危机中心和英雄管理之间导航时，弹出框始终都是可见的。

Clicking the "send" or "cancel" buttons _does_ clear the popup view.
To see how, look at the `closePopup()` method again:

点击“send”或“cancel”按钮，则*会*清除弹出框视图。
为何如此？再看看 `closePopup()` 方法：

<code-example path="router/src/app/compose-message/compose-message.component.ts" header="src/app/compose-message/compose-message.component.ts (closePopup)" region="closePopup"></code-example>

It navigates imperatively with the `Router.navigate()` method, passing in a [link parameters array](#link-parameters-array).

它使用 `Router.navigate()` 方法进行强制导航，并传入了一个[链接参数数组](guide/router#link-parameters-array)。

Like the array bound to the _Contact_ `RouterLink` in the `AppComponent`,
this one includes an object with an `outlets` property.
The `outlets` property value is another object with outlet names for keys.
The only named outlet is `'popup'`.

就像在 `AppComponent` 中绑定到的 *Contact* `RouterLink` 一样，它也包含了一个带 `outlets` 属性的对象。
`outlets` 属性的值是另一个对象，该对象用一些出口名称作为属性名。
唯一的命名出口是 `'popup'`。

This time, the value of `'popup'` is `null`. That's not a route, but it is a legitimate value.
Setting the popup `RouterOutlet` to `null` clears the outlet and removes
the secondary popup route from the current URL.

但这次，`'popup'` 的值是 `null`。`null` 不是一个路由，但却是一个合法的值。
把 `popup` 这个 `RouterOutlet` 设置为 `null` 会清除该出口，并且从当前 URL 中移除第二路由 `popup`。

{@a guards}

## Milestone 5: Route guards

## 里程碑 5：路由守卫

At the moment, *any* user can navigate *anywhere* in the application *anytime*.
That's not always the right thing to do.

现在，*任何用户*都能在*任何时候*导航到*任何地方*。
但有时候这样是不对的。

* Perhaps the user is not authorized to navigate to the target component.

   该用户可能无权导航到目标组件。

* Maybe the user must login (*authenticate*) first.

   可能用户得先登录（认证）。

* Maybe you should fetch some data before you display the target component.

   在显示目标组件前，你可能得先获取某些数据。

* You might want to save pending changes before leaving a component.

   在离开组件前，你可能要先保存修改。

* You might ask the user if it's OK to discard pending changes rather than save them.

   你可能要询问用户：你是否要放弃本次更改，而不用保存它们？

You add _guards_ to the route configuration to handle these scenarios.

你可以往路由配置中添加***守卫***，来处理这些场景。

A guard's return value controls the router's behavior:

守卫返回一个值，以控制路由器的行为：

* If it returns `true`, the navigation process continues.

   如果它返回 `true`，导航过程会继续

* If it returns `false`, the navigation process stops and the user stays put.

   如果它返回 `false`，导航过程就会终止，且用户留在原地。

* If it returns a `UrlTree`, the current navigation cancels and a new navigation is initiated to the `UrlTree` returned.

  如果它返回 `UrlTree`，则取消当前的导航，并且开始导航到返回的这个 `UrlTree`.

<div class="alert is-helpful">

**Note:** The guard can also tell the router to navigate elsewhere, effectively canceling the current navigation. When
doing so inside a guard, the guard should return `false`;

**注意**：守卫还可以告诉路由器导航到别处，这样也会取消当前的导航。要想在守卫中这么做，就要返回 `false`；

</div>

The guard *might* return its boolean answer synchronously.
But in many cases, the guard can't produce an answer synchronously.
The guard could ask the user a question, save changes to the server, or fetch fresh data.
These are all asynchronous operations.

守卫*可以*用同步的方式返回一个布尔值。但在很多情况下，守卫无法用同步的方式给出答案。
守卫可能会向用户问一个问题、把更改保存到服务器，或者获取新数据，而这些都是异步操作。

Accordingly, a routing guard can return an `Observable<boolean>` or a `Promise<boolean>` and the
router will wait for the observable to resolve to `true` or `false`.

因此，路由的守卫可以返回一个 `Observable<boolean>` 或 `Promise<boolean>`，并且路由器会等待这个可观察对象被解析为 `true` 或 `false`。

<div class="alert is-critical">

**Note:** The observable provided to the Router _must_ also complete. If the observable does not complete, the navigation will not continue.

**注意：** 提供给路由器的可观察对象还*必须*能结束（complete）。否则，导航就不会继续。

</div>

The router supports multiple guard interfaces:

路由器可以支持多种守卫接口：

* [`CanActivate`](api/router/CanActivate) to mediate navigation *to* a route.

   用[`CanActivate`](api/router/CanActivate)来处理导航*到*某路由的情况。

* [`CanActivateChild`](api/router/CanActivateChild) to mediate navigation *to* a child route.

   用[`CanActivateChild`](api/router/CanActivateChild)来处理导航*到*某子路由的情况。

* [`CanDeactivate`](api/router/CanDeactivate) to mediate navigation *away* from the current route.

   用[`CanDeactivate`](api/router/CanDeactivate)来处理从当前路由*离开*的情况.

* [`Resolve`](api/router/Resolve) to perform route data retrieval *before* route activation.

   用[`Resolve`](api/router/Resolve)在路由激活*之前*获取路由数据。

* [`CanLoad`](api/router/CanLoad) to mediate navigation *to* a feature module loaded _asynchronously_.

   用[`CanLoad`](api/router/CanLoad)来处理*异步*导航到某特性模块的情况。

You can have multiple guards at every level of a routing hierarchy.
The router checks the `CanDeactivate` and `CanActivateChild` guards first, from the deepest child route to the top.
Then it checks the `CanActivate` guards from the top down to the deepest child route. If the feature module
is loaded asynchronously, the `CanLoad` guard is checked before the module is loaded.
If _any_ guard returns false, pending guards that have not completed will be canceled,
and the entire navigation is canceled.

在分层路由的每个级别上，你都可以设置多个守卫。
路由器会先按照从最深的子路由由下往上检查的顺序来检查 `CanDeactivate()` 和 `CanActivateChild()` 守卫。
然后它会按照从上到下的顺序检查 `CanActivate()` 守卫。
如果特性模块是异步加载的，在加载它之前还会检查 `CanLoad()` 守卫。
如果*任何*一个守卫返回 `false`，其它尚未完成的守卫会被取消，这样整个导航就被取消了。

There are several examples over the next few sections.

接下来的小节中有一些例子。

{@a can-activate-guard}

### _CanActivate_: requiring authentication

### *CanActivate*: 要求认证

Applications often restrict access to a feature area based on who the user is.
You could permit access only to authenticated users or to users with a specific role.
You might block or limit access until the user's account is activated.

应用程序通常会根据访问者来决定是否授予某个特性区的访问权。
你可以只对已认证过的用户或具有特定角色的用户授予访问权，还可以阻止或限制用户访问权，直到用户账户激活为止。

The `CanActivate` guard is the tool to manage these navigation business rules.

`CanActivate` 守卫是一个管理这些导航类业务规则的工具。

#### Add an admin feature module

#### 添加一个“管理”特性模块

In this next section, you'll extend the crisis center with some new *administrative* features.
Those features aren't defined yet.
But you can start by adding a new feature module named `AdminModule`.

在下一节，你将会使用一些新的*管理*特性来扩展危机中心。
那些特性尚未定义，但是你可以先从添加一个名叫 `AdminModule` 的特性模块开始。

Generate an `admin` folder with a feature module file and a routing configuration file.

生成一个带有特性模块文件和路由配置文件的 `admin` 目录。

<code-example language="none" class="code-shell">
  ng generate module admin --routing
</code-example>

Next, generate the supporting components.

接下来，生成一些支持性组件。

<code-example language="none" class="code-shell">
  ng generate component admin/admin-dashboard
</code-example>

<code-example language="none" class="code-shell">
  ng generate component admin/admin
</code-example>

<code-example language="none" class="code-shell">
  ng generate component admin/manage-crises
</code-example>

<code-example language="none" class="code-shell">
  ng generate component admin/manage-heroes
</code-example>

The admin feature file structure looks like this:

管理特性区的文件是这样的：

<div class='filetree'>

  <div class='file'>

    src/app/admin

  </div>

  <div class='children'>

    <div class='file'>
      admin
    </div>

      <div class='children'>

        <div class='file'>
          admin.component.css
        </div>

        <div class='file'>
          admin.component.html
        </div>

        <div class='file'>
          admin.component.ts
        </div>

      </div>

    <div class='file'>
      admin-dashboard
    </div>

      <div class='children'>

        <div class='file'>
          admin-dashboard.component.css
        </div>

        <div class='file'>
          admin-dashboard.component.html
        </div>

        <div class='file'>
          admin-dashboard.component.ts
        </div>

      </div>

    <div class='file'>
      manage-crises
    </div>

      <div class='children'>

        <div class='file'>
          manage-crises.component.css
        </div>

        <div class='file'>
          manage-crises.component.html
        </div>

        <div class='file'>
          manage-crises.component.ts
        </div>

      </div>

    <div class='file'>
      manage-heroes
    </div>

      <div class='children'>

        <div class='file'>
          manage-heroes.component.css
        </div>

        <div class='file'>
          manage-heroes.component.html
        </div>

        <div class='file'>
          manage-heroes.component.ts
        </div>

      </div>

    <div class='file'>
      admin.module.ts
    </div>

    <div class='file'>
      admin-routing.module.ts
    </div>

  </div>

</div>

The admin feature module contains the `AdminComponent` used for routing within the
feature module, a dashboard route and two unfinished components to manage crises and heroes.

管理特性模块包含 `AdminComponent`，它用于在特性模块内的仪表盘路由以及两个尚未完成的用于管理危机和英雄的组件之间进行路由。

<code-tabs>

  <code-pane header="src/app/admin/admin/admin.component.html"  path="router/src/app/admin/admin/admin.component.html">

  </code-pane>

  <code-pane header="src/app/admin/admin-dashboard/admin-dashboard.component.html" path="router/src/app/admin/admin-dashboard/admin-dashboard.component.1.html">

  </code-pane>

  <code-pane header="src/app/admin/admin.module.ts" path="router/src/app/admin/admin.module.ts">

  </code-pane>

  <code-pane header="src/app/admin/manage-crises/manage-crises.component.html" path="router/src/app/admin/manage-crises/manage-crises.component.html">

  </code-pane>

  <code-pane header="src/app/admin/manage-heroes/manage-heroes.component.html"  path="router/src/app/admin/manage-heroes/manage-heroes.component.html">

  </code-pane>

</code-tabs>

<div class="alert is-helpful">

Although the admin dashboard `RouterLink` only contains a relative slash without an additional URL segment, it
is considered a match to any route within the admin feature area. You only want the `Dashboard` link to be active when the user visits that route. Adding an additional binding to the `Dashboard` routerLink,`[routerLinkActiveOptions]="{ exact: true }"`, marks the `./` link as active when the user navigates to the `/admin` URL and not when navigating to any of the child routes.

虽然管理仪表盘中的 `RouterLink` 只包含一个没有其它 URL 段的斜杠 `/`，但它能匹配管理特性区下的任何路由。
但你只希望在访问 `Dashboard` 路由时才激活该链接。
往 `Dashboard` 这个 routerLink 上添加另一个绑定 `[routerLinkActiveOptions]="{ exact: true }"`，
这样就只有当用户导航到 `/admin` 这个 URL 时才会激活它，而不会在导航到它的某个子路由时。

</div>


{@a component-less-route}


##### Component-less route: grouping routes without a component

##### 无组件路由：分组路由，而不需要组件

The initial admin routing configuration:

最初的管理路由配置如下：

<code-example path="router/src/app/admin/admin-routing.module.1.ts" header="src/app/admin/admin-routing.module.ts (admin routing)" region="admin-routes"></code-example>

Looking at the child route under the `AdminComponent`, there is a `path` and a `children`
property but it's not using a `component`.
You haven't made a mistake in the configuration.
You've defined a _component-less_ route.

来看 `AdminComponent` 下的子路由，这里有一个带 **path** 和 **children** 的子路由，
但它没有使用 **component**。这并不是配置中的失误，而是在使用**无组件**路由。

The goal is to group the `Crisis Center` management routes under the `admin` path.
You don't need a component to do it.
A _component-less_ route makes it easier to [guard child routes](#can-activate-child-guard).

这里的目标是对 `admin` 路径下的 ` 危机中心 ` 管理类路由进行分组，但并不需要另一个仅用来分组路由的组件。
一个*无组件*的路由能让[守卫子路由](guide/router#can-activate-child-guard)变得更容易。

Next, import the `AdminModule` into `app.module.ts` and add it to the `imports` array
to register the admin routes.

接下来，把 `AdminModule` 导入到 `app.module.ts` 中，并把它加入 `imports` 数组中来注册这些管理类路由。

<code-example path="router/src/app/app.module.4.ts" header="src/app/app.module.ts (admin module)" region="admin-module"></code-example>

Add an "Admin" link to the `AppComponent` shell so that users can get to this feature.

然后往壳组件 `AppComponent` 中添加一个链接，让用户能点击它，以访问该特性。

<code-example path="router/src/app/app.component.5.html" header="src/app/app.component.html (template)"></code-example>

{@a guard-admin-feature}

#### Guard the admin feature

#### 守护“管理特性”区

Currently every route within the *Crisis Center* is open to everyone.
The new *admin* feature should be accessible only to authenticated users.

现在“危机中心”的每个路由都是对所有人开放的。这些新的*管理特性*应该只能被已登录用户访问。

You could hide the link until the user logs in. But that's tricky and difficult to maintain.

你可以在用户登录之前隐藏这些链接，但这样会有点复杂并难以维护。

Instead you'll write a `canActivate()` guard method to redirect anonymous users to the
login page when they try to enter the admin area.

你可以换种方式：写一个 `CanActivate()` 守卫，将正在尝试访问管理组件匿名用户重定向到登录页。

This is a general purpose guard&mdash;you can imagine other features
that require authenticated users&mdash;so you generate an
`AuthGuard` in the `auth` folder.

这是一个通用的守卫（你可以假设另外一些特性区也要求已认证过的用户才能访问），所以你可以在 `auth` 目录下生成一个 `AuthGuard`。

<code-example language="none" class="code-shell">
  ng generate guard auth/auth
</code-example>

At the moment you're interested in seeing how guards work so the first version does nothing useful.
It simply logs to console and `returns` true immediately, allowing navigation to proceed:

此刻，你的兴趣在于看看守卫是如何工作的，所以第一个版本没做什么有用的事情。它只是往控制台写日志，并且立即返回 `true`，让导航继续：

<code-example path="router/src/app/auth/auth.guard.1.ts" header="src/app/auth/auth.guard.ts (excerpt)"></code-example>

Next, open `admin-routing.module.ts `, import the `AuthGuard` class, and
update the admin route with a `canActivate` guard property that references it:

接下来，打开 `admin-routing.module.ts`，导入 `AuthGuard` 类，修改管理路由并通过 `CanActivate()` 守卫来引用 `AuthGuard`：

<code-example path="router/src/app/admin/admin-routing.module.2.ts" header="src/app/admin/admin-routing.module.ts (guarded admin route)" region="admin-route"></code-example>


The admin feature is now protected by the guard, albeit protected poorly.

管理特性区现在受此守卫保护了，不过这样的保护还不够。

{@a teach-auth}

#### Teach *AuthGuard* to authenticate

#### 教 *AuthGuard* 进行认证

Make the `AuthGuard` at least pretend to authenticate.

先让 `AuthGuard` 至少能“假装”进行认证。

The `AuthGuard` should call an application service that can login a user and retain information about the current user. Generate a new `AuthService` in the `auth` folder:

`AuthGuard` 可以调用应用中的一项服务，该服务能让用户登录，并且保存当前用户的信息。在 `admin` 目录下生成一个新的 `AuthService`：

<code-example language="none" class="code-shell">
  ng generate service auth/auth
</code-example>

Update the `AuthService` to log in the user:

修改 `AuthService` 以登入此用户：

<code-example path="router/src/app/auth/auth.service.ts" header="src/app/auth/auth.service.ts (excerpt)"></code-example>

Although it doesn't actually log in, it has what you need for this discussion.
It has an `isLoggedIn` flag to tell you whether the user is authenticated.
Its `login` method simulates an API call to an external service by returning an
observable that resolves successfully after a short pause.
The `redirectUrl` property will store the attempted URL so you can navigate to it after authenticating.

虽然它不会真的进行登录，但足够让你进行这个讨论了。
它有一个 `isLoggedIn` 标志，用来标识是否用户已经登录过了。
它的 `login` 方法会仿真一个对外部服务的 API 调用，返回一个可观察对象（observable）。在短暂的停顿之后，这个可观察对象就会解析成功。
`redirectUrl` 属性将会保存在 URL 中，以便认证完之后导航到它。

Revise the `AuthGuard` to call it.

这就修改 `AuthGuard` 来调用它。

<code-example path="router/src/app/auth/auth.guard.2.ts" header="src/app/auth/auth.guard.ts (v2)"></code-example>

Notice that you *inject* the `AuthService` and the `Router` in the constructor.
You haven't provided the `AuthService` yet but it's good to know that you can inject helpful services into routing guards.

注意，你把 `AuthService` 和 `Router` 服务*注入到*构造函数中。
你还没有提供 `AuthService`，这里要说明的是：可以往路由守卫中注入有用的服务。

This guard returns a synchronous boolean result.
If the user is logged in, it returns true and the navigation continues.

该守卫返回一个同步的布尔值。如果用户已经登录，它就返回 `true`，导航会继续。

The `ActivatedRouteSnapshot` contains the _future_ route that will be activated and the `RouterStateSnapshot`
contains the _future_ `RouterState` of the application, should you pass through the guard check.

这个 `ActivatedRouteSnapshot` 包含了*即将*被激活的路由，而 `RouterStateSnapshot` 包含了该应用*即将*到达的状态。
你应该通过守卫进行检查。

If the user is not logged in, you store the attempted URL the user came from using the `RouterStateSnapshot.url` and
tell the router to navigate to a login page&mdash;a page you haven't created yet.
This secondary navigation automatically cancels the current navigation; `checkLogin()` returns
`false` just to be clear about that.

如果用户还没有登录，你就会用 `RouterStateSnapshot.url` 保存用户来自的 URL 并让路由器导航到登录页（你尚未创建该页）。
这间接导致路由器自动中止了这次导航，`checkLogin()` 返回 `false` 并不是必须的，但这样可以更清楚的表达意图。

{@a add-login-component}

#### Add the *LoginComponent*

#### 添加 *LoginComponent*

You need a `LoginComponent` for the user to log in to the app. After logging in, you'll redirect
to the stored URL if available, or use the default URL.
There is nothing new about this component or the way you wire it into the router configuration.

你需要一个 `LoginComponent` 来让用户登录进这个应用。在登录之后，你就会跳转到前面保存的 URL，如果没有，就跳转到默认 URL。
  该组件没有什么新内容，你把它放进路由配置的方式也没什么新意。

<code-example language="none" class="code-shell">
  ng generate component auth/login
</code-example>

Register a `/login` route in the `auth/auth-routing.module.ts`. In `app.module.ts`, import and add the `AuthModule` to the `AppModule` imports.

在 `auth/auth-routing.module.ts` 文件中注册一个 `/login` 路由。在 `app.module.ts` 中，导入 `AuthModule` 并且添加到 `AppModule` 的 `imports` 中。

<code-tabs>

  <code-pane header="src/app/app.module.ts" path="router/src/app/app.module.ts" region="auth">

  </code-pane>

  <code-pane header="src/app/auth/login/login.component.html" path="router/src/app/auth/login/login.component.html">

  </code-pane>

  <code-pane header="src/app/auth/login/login.component.ts" path="router/src/app/auth/login/login.component.1.ts">

  </code-pane>

  <code-pane header="src/app/auth/auth.module.ts" path="router/src/app/auth/auth.module.ts">

  </code-pane>

</code-tabs>


{@a can-activate-child-guard}

### _CanActivateChild_: guarding child routes

### `CanActivateChild`：保护子路由

You can also protect child routes with the `CanActivateChild` guard.
The `CanActivateChild` guard is similar to the `CanActivate` guard.
The key difference is that it runs _before_  any child route is activated.

你还可以使用 `CanActivateChild` 守卫来保护子路由。
`CanActivateChild` 守卫和 `CanActivate` 守卫很像。
它们的区别在于，`CanActivateChild` 会在*任何子路由*被激活之前运行。

You protected the admin feature module from unauthorized access.
You should also protect child routes _within_ the feature module.

你要保护管理特性模块，防止它被非授权访问，还要保护这个特性模块*内部*的那些子路由。

Extend the `AuthGuard` to protect when navigating between the `admin` routes.
Open `auth.guard.ts` and add the `CanActivateChild` interface to the imported tokens from the router package.

扩展 `AuthGuard` 以便在 `admin` 路由之间导航时提供保护。
打开 `auth.guard.ts` 并从路由库中导入 `CanActivateChild` 接口。

Next, implement the `canActivateChild()` method which takes the same arguments as the `canActivate()` method:
an `ActivatedRouteSnapshot` and `RouterStateSnapshot`.
The `canActivateChild()` method can return an `Observable<boolean>` or `Promise<boolean>` for
async checks and a `boolean` for sync checks.
This one returns a `boolean`:

接下来，实现 `CanActivateChild` 方法，它所接收的参数与 `CanActivate` 方法一样：一个 `ActivatedRouteSnapshot` 和一个 `RouterStateSnapshot`。
`CanActivateChild` 方法可以返回 `Observable<boolean>` 或 `Promise<boolean>` 来支持异步检查，或 `boolean` 来支持同步检查。
这里返回的是 `boolean`：

<code-example path="router/src/app/auth/auth.guard.3.ts" header="src/app/auth/auth.guard.ts (excerpt)" region="can-activate-child"></code-example>

Add the same `AuthGuard` to the `component-less` admin route to protect all other child routes at one time
instead of adding the `AuthGuard` to each route individually.

同样把这个 `AuthGuard` 添加到“无组件的”管理路由，来同时保护它的所有子路由，而不是为每个路由单独添加这个 `AuthGuard`。

<code-example path="router/src/app/admin/admin-routing.module.3.ts" header="src/app/admin/admin-routing.module.ts (excerpt)" region="can-activate-child"></code-example>

{@a can-deactivate-guard}

### _CanDeactivate_: handling unsaved changes

### *CanDeactivate*：处理未保存的更改

Back in the "Heroes" workflow, the app accepts every change to a hero immediately without hesitation or validation.

回到“Heroes”工作流，该应用毫不犹豫的接受对英雄的任何修改，不作任何校验。

In the real world, you might have to accumulate the users changes.
You might have to validate across fields.
You might have to validate on the server.
You might have to hold changes in a pending state until the user confirms them *as a group* or
cancels and reverts all changes.

在现实世界中，你得先把用户的改动积累起来。
你可能不得不进行跨字段的校验，可能要找服务器进行校验，可能得把这些改动保存成一种待定状态，直到用户或者把这些改动*作为一组*进行确认或撤销所有改动。

What do you do about unapproved, unsaved changes when the user navigates away?
You can't just leave and risk losing the user's changes; that would be a terrible experience.

当用户要导航到外面时，该怎么处理这些既没有审核通过又没有保存过的改动呢？
  你不能马上离开，不在乎丢失这些改动的风险，那显然是一种糟糕的用户体验。

It's better to pause and let the user decide what to do.
If the user cancels, you'll stay put and allow more changes.
If the user approves, the app can save.

最好能暂停，并让用户决定该怎么做。
如果用户选择了取消，你就留下来，并允许更多改动。
如果用户选择了确认，那就进行保存。

You still might delay navigation until the save succeeds.
If you let the user move to the next screen immediately and
the save were to fail (perhaps the data are ruled invalid), you would lose the context of the error.

在保存成功之前，你还可以继续推迟导航。如果你让用户立即移到下一个界面，而保存却失败了（可能因为数据不符合有效性规则），你就会丢失该错误的上下文环境。

You can't block while waiting for the server&mdash;that's not possible in a browser.
You need to stop the navigation while you wait, asynchronously, for the server
to return with its answer.

在等待服务器的答复时，你没法阻塞它 —— 这在浏览器中是不可能的。
  你只能用异步的方式在等待服务器答复之前先停止导航。

You need the `CanDeactivate` guard.

你需要 `CanDeactivate` 守卫。

{@a cancel-save}

#### Cancel and save

#### 取消与保存

The sample application doesn't talk to a server.
Fortunately, you have another way to demonstrate an asynchronous router hook.

这个范例应用不会与服务器通讯。
幸运的是，你有另一种方式来演示异步的路由器钩子。

Users update crisis information in the `CrisisDetailComponent`.
Unlike the `HeroDetailComponent`, the user changes do not update the crisis entity immediately.
Instead, the app updates the entity when the user presses the *Save* button and
discards the changes when the user presses the *Cancel* button.

用户在 `CrisisDetailComponent` 中更新危机信息。
与 `HeroDetailComponent` 不同，用户的改动不会立即更新危机的实体对象。当用户按下了 *Save* 按钮时，应用就更新这个实体对象；如果按了 *Cancel* 按钮，那就放弃这些更改。

Both buttons navigate back to the crisis list after save or cancel.

这两个按钮都会在保存或取消之后导航回危机列表。

<code-example path="router/src/app/crisis-center/crisis-detail/crisis-detail.component.ts" header="src/app/crisis-center/crisis-detail/crisis-detail.component.ts (cancel and save methods)" region="cancel-save"></code-example>

What if the user tries to navigate away without saving or canceling?
The user could push the browser back button or click the heroes link.
Both actions trigger a navigation.
Should the app save or cancel automatically?

如果用户尝试不保存或撤销就导航到外面该怎么办？
  用户可以按浏览器的后退按钮，或点击英雄的链接。
  这些操作都会触发导航。本应用应该自动保存或取消吗？

This demo does neither. Instead, it asks the user to make that choice explicitly
in a confirmation dialog box that *waits asynchronously for the user's
answer*.

都不行。应用应该弹出一个确认对话框来要求用户明确做出选择，该对话框会*用异步的方式等用户做出选择*。

<div class="alert is-helpful">

You could wait for the user's answer with synchronous, blocking code.
The app will be more responsive&mdash;and can do other work&mdash;by
waiting for the user's answer asynchronously. Waiting for the user asynchronously
is like waiting for the server asynchronously.

你也能用同步的方式等用户的答复，阻塞代码。但如果能用异步的方式等待用户的答复，应用就会响应性更好，也能同时做别的事。异步等待用户的答复和等待服务器的答复是类似的。

</div>

Generate a `Dialog` service to handle user confirmation.

生成一个 `Dialog` 服务，以处理用户的确认操作。

<code-example language="none" class="code-shell">
  ng generate service dialog
</code-example>

Add a `confirm()` method to the `DialogService` to prompt the user to confirm their intent. The `window.confirm` is a _blocking_ action that displays a modal dialog and waits for user interaction.

为 `DialogService` 添加一个 `confirm()` 方法，以提醒用户确认。`window.confirm` 是一个*阻塞型*操作，它会显示一个模态对话框，并等待用户的交互。

<code-example path="router/src/app/dialog.service.ts" header="src/app/dialog.service.ts"></code-example>

It returns an `Observable` that *resolves* when the user eventually decides what to do: either
to discard changes and navigate away (`true`) or to preserve the pending changes and stay in the crisis editor (`false`).

它返回*observable*，当用户最终决定了如何去做时，它就会被*解析* —— 或者决定放弃更改直接导航离开（`true`），或者保留未完成的修改，留在危机编辑器中（`false`）。

{@a CanDeactivate}

Generate a _guard_ that checks for the presence of a `canDeactivate()` method in a component&mdash;any component.

生成一个*守卫（guard）*，以检查组件（任意组件均可）中是否存在 `canDeactivate()` 方法。

<code-example language="none" class="code-shell">
  ng generate guard can-deactivate
</code-example>

The `CrisisDetailComponent` will have this method.
But the guard doesn't have to know that.
The guard shouldn't know the details of any component's deactivation method.
It need only detect that the component has a `canDeactivate()` method and call it.
This approach makes the guard reusable.

创建了一个 `Guard`，它将检查这个（任意）组件中是否有 `canDeactivate()` 函数。
`CrisisDetailComponent` 就会有这个方法。
但是该守卫并不需要知道 `CrisisDetailComponent` 确认退出激活状态的详情。
它只需要检查该组件是否有一个 `canDeactivate()` 方法，并调用它。
这就让该守卫可以复用。

<code-example path="router/src/app/can-deactivate.guard.ts" header="src/app/can-deactivate.guard.ts"></code-example>

Alternatively, you could make a component-specific `CanDeactivate` guard for the `CrisisDetailComponent`.
The `canDeactivate()` method provides you with the current
instance of the `component`, the current `ActivatedRoute`,
and `RouterStateSnapshot` in case you needed to access
some external information. This would be useful if you only
wanted to use this guard for this component and needed to get
the component's properties or confirm whether the router should allow navigation away from it.

另外，你也可以为 `CrisisDetailComponent` 创建一个特定的 `CanDeactivate` 守卫。
在需要访问外部信息时，`canDeactivate()` 方法为你提供了组件、`ActivatedRoute` 和 `RouterStateSnapshot` 的当前实例。
如果只想为这个组件使用该守卫，并且需要获取该组件属性或确认路由器是否允许从该组件导航出去时，这会非常有用。

<code-example path="router/src/app/can-deactivate.guard.1.ts" header="src/app/can-deactivate.guard.ts (component-specific)"></code-example>

Looking back at the `CrisisDetailComponent`, it implements the confirmation workflow for unsaved changes.

看看 `CrisisDetailComponent` 组件，它已经实现了对未保存的更改进行确认的工作流。

<code-example path="router/src/app/crisis-center/crisis-detail/crisis-detail.component.ts" header="src/app/crisis-center/crisis-detail/crisis-detail.component.ts (excerpt)" region="canDeactivate"></code-example>

Notice that the `canDeactivate()` method *can* return synchronously;
it returns `true` immediately if there is no crisis or there are no pending changes.
But it can also return a `Promise` or an `Observable` and the router will wait for that
to resolve to truthy (navigate) or falsy (stay put).

注意，`canDeactivate` 方法*可以*同步返回，如果没有危机，或者没有未定的修改，它就立即返回 `true`。但是它也可以返回一个承诺（`Promise`）或可观察对象（`Observable`），路由器将等待它们被解析为真值（继续导航）或假值（留下）。

Add the `Guard` to the crisis detail route in `crisis-center-routing.module.ts` using the `canDeactivate` array property.

往 `crisis-center.routing.module.ts` 的危机详情路由中用 `canDeactivate` 数组添加一个 `Guard`（守卫）。

<code-example path="router/src/app/crisis-center/crisis-center-routing.module.3.ts" header="src/app/crisis-center/crisis-center-routing.module.ts (can deactivate guard)"></code-example>


Now you have given the user a safeguard against unsaved changes.

现在，你已经给了用户一个能保护未保存更改的安全守卫。

{@a Resolve}

{@a resolve-guard}

### _Resolve_: pre-fetching component data

### _Resolve_: 预先获取组件数据

In the `Hero Detail` and `Crisis Detail`, the app waited until the route was activated to fetch the respective hero or crisis.

在 `Hero Detail` 和 `Crisis Detail` 中，它们等待路由读取完对应的英雄和危机。

This worked well, but there's a better way.
If you were using a real world API, there might be some delay before the data to display is returned from the server.
You don't want to display a blank component while waiting for the data.

这种方式没有问题，但是它们还有进步的空间。
  如果你在使用真实 api，很有可能数据返回有延迟，导致无法即时显示。
  在这种情况下，直到数据到达前，显示一个空的组件不是最好的用户体验。

It's preferable to pre-fetch data from the server so it's ready the
moment the route is activated. This also allows you to handle errors before routing to the component.
There's no point in navigating to a crisis detail for an `id` that doesn't have a record.
It'd be better to send the user back to the `Crisis List` that shows only valid crisis centers.

最好预先从服务器上获取完数据，这样在路由激活的那一刻数据就准备好了。
还要在路由到此组件之前处理好错误。
但当某个 `id` 无法对应到一个危机详情时，就没办法处理它。
这时最好把用户带回到“危机列表”中，那里显示了所有有效的“危机”。

In summary, you want to delay rendering the routed component until all necessary data have been fetched.

总之，你希望的是只有当所有必要数据都已经拿到之后，才渲染这个路由组件。

You need a *resolver*.

你需要 `Resolve` 守卫。

{@a fetch-before-navigating}

#### Fetch data before navigating

#### 导航前预先加载路由信息

At the moment, the `CrisisDetailComponent` retrieves the selected crisis.
If the crisis is not found, it navigates back to the crisis list view.

目前，`CrisisDetailComponent` 会接收选中的危机。
如果该危机没有找到，它就会导航回危机列表视图。

The experience might be better if all of this were handled first, before the route is activated.
A `CrisisDetailResolver` service could retrieve a `Crisis` or navigate away if the `Crisis` does not exist
_before_ activating the route and creating the `CrisisDetailComponent`.

如果能在该路由将要激活时提前处理了这个问题，那么用户体验会更好。
`CrisisDetailResolver` 服务可以接收一个 `Crisis`，而如果这个 `Crisis` 不存在，就会在激活该路由并创建 `CrisisDetailComponent` 之前先行离开。

Generate a `CrisisDetailResolver` service file within the `Crisis Center` feature area.

在 `Crisis Center` 特性区生成一个 `CrisisDetailResolver` 服务文件。

<code-example language="none" class="code-shell">
  ng generate service crisis-center/crisis-detail-resolver
</code-example>


<code-example path="router/src/app/crisis-center/crisis-detail-resolver.service.1.ts" header="src/app/crisis-center/crisis-detail-resolver.service.ts (generated)"></code-example>

Take the relevant parts of the crisis retrieval logic in `CrisisDetailComponent.ngOnInit`
and move them into the `CrisisDetailResolverService`.
Import the `Crisis` model, `CrisisService`, and the `Router`
so you can navigate elsewhere if you can't fetch the crisis.

在 `CrisisDetailComponent.ngOnInit` 中拿到相关的危机检索逻辑，并且把它们移到 `CrisisDetailResolverService` 中。
导入 `Crisis` 模型、`CrisisService` 和 `Router` 以便让你可以在找不到指定的危机时导航到别处。

Be explicit. Implement the `Resolve` interface with a type of `Crisis`.

为了更明确一点，可以实现一个带有 `Crisis` 类型的 `Resolve` 接口。

Inject the `CrisisService` and `Router` and implement the `resolve()` method.
That method could return a `Promise`, an `Observable`, or a synchronous return value.

注入 `CrisisService` 和 `Router`，并实现 `resolve()` 方法。
该方法可以返回一个 `Promise`、一个 `Observable` 来支持异步方式，或者直接返回一个值来支持同步方式。

The `CrisisService.getCrisis` method returns an observable, in order to prevent the route from loading until the data is fetched.
The `Router` guards require an observable to `complete`, meaning it has emitted all
of its values. You use the `take` operator with an argument of `1` to ensure that the
Observable completes after retrieving the first value from the Observable returned by the
`getCrisis` method.

`CrisisService.getCrisis` 方法返回一个可观察对象，以防止在数据获取完之前加载本路由。
`Router` 守卫要求这个可观察对象必须可结束（`complete`），也就是说它已经发出了所有值。
你可以为 `take` 操作符传入一个参数 `1`，以确保这个可观察对象会在从 `getCrisis` 方法所返回的可观察对象中取到第一个值之后就会结束。

If it doesn't return a valid `Crisis`, return an empty `Observable`, canceling the previous in-flight navigation to the `CrisisDetailComponent` and navigate the user back to the `CrisisListComponent`. The updated resolver service looks like this:

如果它没有返回有效的 `Crisis`，就会返回一个 `Observable`，以取消以前到 `CrisisDetailComponent` 的在途导航，并把用户导航回 `CrisisListComponent`。修改后的 `resolver` 服务是这样的：

<code-example path="router/src/app/crisis-center/crisis-detail-resolver.service.ts" header="src/app/crisis-center/crisis-detail-resolver.service.ts"></code-example>

Import this resolver in the `crisis-center-routing.module.ts`
and add a `resolve` object to the `CrisisDetailComponent` route configuration.

把这个解析器（resolver）导入到 `crisis-center-routing.module.ts` 中，并往 `CrisisDetailComponent` 的路由配置中添加一个 `resolve` 对象。

<code-example path="router/src/app/crisis-center/crisis-center-routing.module.4.ts" header="src/app/crisis-center/crisis-center-routing.module.ts (resolver)"></code-example>

The `CrisisDetailComponent` should no longer fetch the crisis.
Update the `CrisisDetailComponent` to get the crisis from the  `ActivatedRoute.data.crisis` property instead;
that's where you said it should be when you re-configured the route.
It will be there when the `CrisisDetailComponent` ask for it.

`CrisisDetailComponent` 不应该再去获取这个危机的详情。
把 `CrisisDetailComponent` 改成从 `ActivatedRoute.data.crisis` 属性中获取危机详情，这正是你重新配置路由的恰当时机。
当 `CrisisDetailComponent` 要求取得危机详情时，它就已经在那里了。

<code-example path="router/src/app/crisis-center/crisis-detail/crisis-detail.component.ts" header="src/app/crisis-center/crisis-detail/crisis-detail.component.ts (ngOnInit v2)" region="ngOnInit"></code-example>

**Two critical points**

**两个关键点**

1. The router's `Resolve` interface is optional.
The `CrisisDetailResolverService` doesn't inherit from a base class.
The router looks for that method and calls it if found.

   路由器的这个 `Resolve` 接口是可选的。`CrisisDetailResolverService` 没有继承自某个基类。路由器只要找到了这个方法，就会调用它。

1. Rely on the router to call the resolver.
Don't worry about all the ways that the user could navigate away.
That's the router's job. Write this class and let the router take it from there.

   要依赖路由器调用此守卫。不必关心用户用哪种方式导航离开，这是路由器的工作。你只要写出这个类，等路由器从那里取出它就可以了。

The relevant *Crisis Center* code for this milestone follows.

本里程碑中与*危机中心*有关的代码如下：

<code-tabs>

  <code-pane header="app.component.html" path="router/src/app/app.component.html">

  </code-pane>

  <code-pane header="crisis-center-home.component.html" path="router/src/app/crisis-center/crisis-center-home/crisis-center-home.component.html">

  </code-pane>

  <code-pane header="crisis-center.component.html" path="router/src/app/crisis-center/crisis-center/crisis-center.component.html">

  </code-pane>

  <code-pane header="crisis-center-routing.module.ts" path="router/src/app/crisis-center/crisis-center-routing.module.4.ts">

  </code-pane>

  <code-pane header="crisis-list.component.html" path="router/src/app/crisis-center/crisis-list/crisis-list.component.html">

  </code-pane>

  <code-pane header="crisis-list.component.ts" path="router/src/app/crisis-center/crisis-list/crisis-list.component.ts">

  </code-pane>

  <code-pane header="crisis-detail.component.html" path="router/src/app/crisis-center/crisis-detail/crisis-detail.component.html">

  </code-pane>

  <code-pane header="crisis-detail.component.ts" path="router/src/app/crisis-center/crisis-detail/crisis-detail.component.ts">

  </code-pane>

  <code-pane header="crisis-detail-resolver.service.ts" path="router/src/app/crisis-center/crisis-detail-resolver.service.ts">

  </code-pane>

  <code-pane header="crisis.service.ts" path="router/src/app/crisis-center/crisis.service.ts">

  </code-pane>

  <code-pane header="dialog.service.ts" path="router/src/app/dialog.service.ts">

  </code-pane>

</code-tabs>

Guards

路由守卫

<code-tabs>

  <code-pane header="auth.guard.ts" path="router/src/app/auth/auth.guard.3.ts">

  </code-pane>

  <code-pane header="can-deactivate.guard.ts" path="router/src/app/can-deactivate.guard.ts">

  </code-pane>

</code-tabs>

{@a query-parameters}

{@a fragment}

### Query parameters and fragments

### 查询参数及片段

In the [route parameters](#optional-route-parameters) example, you only dealt with parameters specific to
the route, but what if you wanted optional parameters available to all routes?
This is where query parameters come into play.

在这个[查询参数](#optional-route-parameters)例子中，你只为路由指定了参数，但是该如何定义一些所有路由中都可用的可选参数呢？
这就该“查询参数”登场了。

[Fragments](https://en.wikipedia.org/wiki/Fragment_identifier) refer to certain elements on the page
identified with an `id` attribute.

[片段](https://en.wikipedia.org/wiki/Fragment_identifier)可以引用页面中带有特定 `id` 属性的元素.

Update the `AuthGuard` to provide a `session_id` query that will remain after navigating to another route.

修改 `AuthGuard` 以提供 `session_id` 查询参数，在导航到其它路由后，它还会存在。

Add an `anchor` element so you can jump to a certain point on the page.

再添加一个锚点（`A`）元素，来让你能跳转到页面中的正确位置。

Add the `NavigationExtras` object to the `router.navigate()` method that navigates you to the `/login` route.

为 `router.navigate()` 方法添加一个 `NavigationExtras` 对象，用来导航到 `/login` 路由。

<code-example path="router/src/app/auth/auth.guard.4.ts" header="src/app/auth/auth.guard.ts (v3)"></code-example>

You can also preserve query parameters and fragments across navigations without having to provide them
again when navigating. In the `LoginComponent`, you'll add an *object* as the
second argument in the `router.navigateUrl()` function
and provide the `queryParamsHandling` and `preserveFragment` to pass along the current query parameters
and fragment to the next route.

还可以在导航之间**保留**查询参数和片段，而无需再次在导航中提供。在 `LoginComponent` 中的 `router.navigateUrl()` 方法中，添加一个对象作为第二个参数，该**对象**提供了 `queryParamsHandling` 和 `preserveFragment`，用于传递当前的查询参数和片段到下一个路由。

<code-example path="router/src/app/auth/login/login.component.ts" header="src/app/auth/login/login.component.ts (preserve)" region="preserve"></code-example>

<div class="alert is-helpful">

The `queryParamsHandling` feature also provides a `merge` option, which will preserve and combine the current query parameters with any provided query parameters
when navigating.

`queryParamsHandling` 特性还提供了 `merge` 选项，它将会在导航时保留当前的查询参数，并与其它查询参数合并。

</div>

As you'll be navigating to the *Admin Dashboard* route after logging in, you'll update it to handle the
query parameters and fragment.

由于要在登录后导航到*危机管理*特征区的路由，所以你还得修改它，来处理这些全局查询参数和片段。

<code-example path="router/src/app/admin/admin-dashboard/admin-dashboard.component.1.ts" header="src/app/admin/admin-dashboard/admin-dashboard.component.ts (v2)"></code-example>

*Query parameters* and *fragments* are also available through the `ActivatedRoute` service.
Just like *route parameters*, the query parameters and fragments are provided as an `Observable`.
The updated *Crisis Admin* component feeds the `Observable` directly into the template using the `AsyncPipe`.

*查询参数*和*片段*可通过 `Router` 服务的 `routerState` 属性使用。和*路由参数*类似，全局查询参数和片段也是 `Observable` 对象。
  在修改过的*英雄管理*组件中，你将借助 `AsyncPipe` 直接把 `Observable` 传给模板。

Now, you can click on the *Admin* button, which takes you to the *Login*
page with the provided `queryParamMap` and `fragment`. After you click the login button, notice that
you have been redirected to the `Admin Dashboard` page with the query parameters and fragment still intact in the address bar.

按照下列步骤试验下：点击*Crisis Admin*按钮，它会带着你提供的 `queryParamMap` 和 `fragment` 跳转到登录页。
点击登录按钮，你就会被重定向到 `Admin Dashboard` 页。
注意，它仍然带着上一步提供的 `queryParamMap` 和 `fragment`。

You can use these persistent bits of information for things that need to be provided across pages like
authentication tokens or session ids.

你可以用这些持久化信息来携带需要为每个页面都提供的信息，如认证令牌或会话的 ID 等。

<div class="alert is-helpful">

The `query params` and `fragment` can also be preserved using a `RouterLink` with
the `queryParamsHandling` and `preserveFragment` bindings respectively.

“查询参数”和“片段”也可以分别用 `RouterLink` 中的 **queryParamsHandling** 和 **preserveFragment** 保存。

</div>

{@a asynchronous-routing}

## Milestone 6: Asynchronous routing

## 里程碑 6：异步路由

As you've worked through the milestones, the application has naturally gotten larger.
As you continue to build out feature areas, the overall application size will continue to grow.
At some point you'll reach a tipping point where the application takes a long time to load.

完成上面的里程碑后，应用程序很自然地长大了。在继续构建特征区的过程中，应用的尺寸将会变得更大。在某一个时间点，你将达到一个顶点，应用将会需要过多的时间来加载。

How do you combat this problem?  With asynchronous routing, which loads feature modules _lazily_, on request.
Lazy loading has multiple benefits.

如何才能解决这个问题呢？通过引进异步路由，可以获得在请求时才**惰性**加载特性模块的能力。
惰性加载有多个优点：

* You can load feature areas only when requested by the user.

   你可以只在用户请求时才加载某些特性区。

* You can speed up load time for users that only visit certain areas of the application.

   对于那些只访问应用程序某些区域的用户，这样能加快加载速度。

* You can continue expanding lazy loaded feature areas without increasing the size of the initial load bundle.

   你可以持续扩充惰性加载特性区的功能，而不用增加初始加载的包体积。

You're already part of the way there.
By organizing the application into modules&mdash;`AppModule`,
`HeroesModule`, `AdminModule` and `CrisisCenterModule`&mdash;you
have natural candidates for lazy loading.

你已经完成了一部分。通过把应用组织成一些模块：`AppModule`、`HeroesModule`、`AdminModule` 和 `CrisisCenterModule`，
你已经有了可用于实现惰性加载的候选者。

Some modules, like `AppModule`, must be loaded from the start.
But others can and should be lazy loaded.
The `AdminModule`, for example, is needed by a few authorized users, so
you should only load it when requested by the right people.

有些模块（比如 `AppModule`）必须在启动时加载，但其它的都可以而且应该惰性加载。
比如 `AdminModule` 就只有少数已认证的用户才需要它，所以你应该只有在正确的人请求它时才加载。

{@a lazy-loading-route-config}

### Lazy Loading route configuration

### 惰性加载路由配置

Change the `admin` **path** in the `admin-routing.module.ts` from `'admin'` to an empty string, `''`, the _empty path_.

把 `admin-routing.module.ts` 中的 `admin` 路径从 `'admin'` 改为空路径 `''`。

The `Router` supports  *empty path* routes;
use them to group routes together without adding any additional path segments to the URL.
Users will still visit `/admin` and the `AdminComponent` still serves as the *Routing Component* containing child routes.

`Router` 支持*空路径*路由，可以使用它们来分组路由，而不用往 URL 中添加额外的路径片段。
用户仍旧访问 `/admin`，并且 `AdminComponent` 仍然作为用来包含子路由的*路由组件*。

Open the `AppRoutingModule` and add a new `admin` route to its `appRoutes` array.

打开 `AppRoutingModule`，并把一个新的 `admin` 路由添加到它的 `appRoutes` 数组中。

Give it a `loadChildren` property instead of a `children` property.
The `loadChildren` property takes a function that returns a promise using the browser's built-in syntax for lazy loading code using dynamic imports `import('...')`.
The path is the location of the `AdminModule` (relative to the app root).
After the code is requested and loaded, the `Promise` resolves an object that contains the `NgModule`, in this case the  `AdminModule`.

给它一个 `loadChildren` 属性（替换掉 `children` 属性）。
`loadChildren` 属性接收一个函数，该函数使用浏览器内置的动态导入语法 `import('...')` 来惰性加载代码，并返回一个承诺（Promise）。
其路径是 `AdminModule` 的位置（相对于应用的根目录）。
当代码请求并加载完毕后，这个 `Promise` 就会解析成一个包含 `NgModule` 的对象，也就是 `AdminModule`。

<code-example path="router/src/app/app-routing.module.5.ts" region="admin-1" header="app-routing.module.ts (load children)"></code-example>

<div class="alert is-important">

*Note*: When using absolute paths, the `NgModule` file location must begin with `src/app` in order to resolve correctly. For custom [path mapping with absolute paths](https://www.typescriptlang.org/docs/handbook/module-resolution.html#path-mapping), the `baseUrl` and `paths` properties in the project `tsconfig.json` must be configured.

**注意**： 当使用绝对路径时，`NgModule` 的文件位置必须以 `src/app` 开头，以便正确解析。对于自定义的 [使用绝对路径的路径映射表](https://www.typescriptlang.org/docs/handbook/module-resolution.html#path-mapping)，项目的 `tsconfig.json` 中必须配置好 `baseUrl` 和 `paths` 属性。

</div>


When the router navigates to this route, it uses the `loadChildren` string to dynamically load the `AdminModule`.
Then it adds the `AdminModule` routes to its current route configuration.
Finally, it loads the requested route to the destination admin component.

当路由器导航到这个路由时，它会用 `loadChildren` 字符串来动态加载 `AdminModule`，然后把 `AdminModule` 添加到当前的路由配置中，
最后，它把所请求的路由加载到目标 `admin` 组件中。

The lazy loading and re-configuration happen just once, when the route is _first_ requested;
the module and routes are available immediately for subsequent requests.

惰性加载和重新配置工作只会发生一次，也就是在该路由*首次*被请求时。在后续的请求中，该模块和路由都是立即可用的。

<div class="alert is-helpful">

Angular provides a built-in module loader that supports SystemJS to load modules asynchronously. If you were
using another bundling tool, such as Webpack, you would use the Webpack mechanism for asynchronously loading modules.

Angular 提供一个内置模块加载器，支持**`SystemJS`**来异步加载模块。如果你使用其它捆绑工具比如 **Webpack**，则使用 Webpack 的机制来异步加载模块。

</div>

Take the final step and detach the admin feature set from the main application.
The root `AppModule` must neither load nor reference the `AdminModule` or its files.

最后一步是把管理特性区从主应用中完全分离开。
根模块 `AppModule` 既不能加载也不能引用 `AdminModule` 及其文件。

In `app.module.ts`, remove the `AdminModule` import statement from the top of the file
and remove the `AdminModule` from the NgModule's `imports` array.

在 `app.module.ts` 中，从顶部移除 `AdminModule` 的导入语句，并且从 NgModule 的 `imports` 数组中移除 `AdminModule`。

{@a can-load-guard}

### _CanLoad_ Guard: guarding unauthorized loading of feature modules

### `CanLoad` 守卫：保护对特性模块的未授权加载

You're already protecting the `AdminModule` with a `CanActivate` guard that prevents unauthorized users from
accessing the admin feature area.
It redirects to the login page if the user is not authorized.

你已经使用 `CanActivate` 保护 `AdminModule` 了，它会阻止未授权用户访问管理特性区。如果用户未登录，它就会跳转到登录页。

But the router is still loading the `AdminModule` even if the user can't visit any of its components.
Ideally, you'd only load the `AdminModule` if the user is logged in.

但是路由器仍然会加载 `AdminModule` —— 即使用户无法访问它的任何一个组件。
理想的方式是，只有在用户已登录的情况下你才加载 `AdminModule`。

Add a **`CanLoad`** guard that only loads the `AdminModule` once the user is logged in _and_ attempts to access the admin feature area.

添加一个**`CanLoad`**守卫，它只在用户已登录*并且*尝试访问管理特性区的时候，才加载 `AdminModule` 一次。

The existing `AuthGuard` already has the essential logic in
its `checkLogin()` method to support the `CanLoad` guard.

现有的 `AuthGuard` 的 `checkLogin()` 方法中已经有了支持 `CanLoad` 守卫的基础逻辑。

Open `auth.guard.ts`.
Import the `CanLoad` interface from `@angular/router`.
Add it to the `AuthGuard` class's `implements` list.
Then implement `canLoad()` as follows:

打开 `auth.guard.ts`，从 `@angular/router` 中导入 `CanLoad` 接口。
把它添加到 `AuthGuard` 类的 `implements` 列表中。
然后实现 `canLoad`，代码如下：

<code-example path="router/src/app/auth/auth.guard.ts" header="src/app/auth/auth.guard.ts (CanLoad guard)" region="canLoad"></code-example>

The router sets the `canLoad()` method's `route` parameter to the intended destination URL.
The `checkLogin()` method redirects to that URL once the user has logged in.

路由器会把 `canLoad()` 方法的 `route` 参数设置为准备访问的目标 URL。
如果用户已经登录了，`checkLogin()` 方法就会重定向到那个 URL。

Now import the `AuthGuard` into the `AppRoutingModule` and add the `AuthGuard` to the `canLoad`
array property for the `admin` route.
The completed admin route looks like this:

现在，把 `AuthGuard` 导入到 `AppRoutingModule` 中，并把 `AuthGuard` 添加到 `admin` 路由的 `canLoad` 数组中。
完整的 `admin` 路由是这样的：

<code-example path="router/src/app/app-routing.module.5.ts" region="admin" header="app-routing.module.ts (lazy admin route)"></code-example>

{@a preloading}

### Preloading: background loading of feature areas

### 预加载：特性区的后台加载

You've learned how to load modules on-demand.
You can also load modules asynchronously with _preloading_.

你已经学会了如何按需加载模块，接下来再看看如何使用*预加载*技术异步加载模块。

This may seem like what the app has been doing all along. Not quite.
The `AppModule` is loaded when the application starts; that's _eager_ loading.
Now the `AdminModule` loads only when the user clicks on a link; that's _lazy_ loading.

看起来好像应用一直都是这么做的，但其实并非如此。
`AppModule` 在应用启动时就被加载了，它是*立即*加载的。
而 `AdminModule` 只有当用户点击某个链接时才会加载，它是*惰性*加载的。

_Preloading_ is something in between.
Consider the _Crisis Center_.
It isn't the first view that a user sees.
By default, the _Heroes_ are the first view.
For the smallest initial payload and fastest launch time,
you should eagerly load the `AppModule` and the `HeroesModule`.

*预加载*是介于两者之间的一种方式。
来看看*危机中心*。
用户第一眼不会看到它。
默认情况下，*英雄管理*才是第一视图。
为了获得尽可能小的初始加载体积和最快的加载速度，你应该对 `AppModule` 和 `HeroesModule` 进行急性加载。

You could lazy load the _Crisis Center_.
But you're almost certain that the user will visit the _Crisis Center_ within minutes of launching the app.
Ideally, the app would launch with just the `AppModule` and the `HeroesModule` loaded
and then, almost immediately, load the `CrisisCenterModule` in the background.
By the time the user navigates to the _Crisis Center_, its module will have been loaded and ready to go.

你可以惰性加载*危机中心*。
但是，你几乎可以肯定用户会在启动应用之后的几分钟内访问*危机中心*。
理想情况下，应用启动时应该只加载 `AppModule` 和 `HeroesModule`，然后几乎立即开始后台加载 `CrisisCenterModule`。
在用户浏览到*危机中心*之前，该模块应该已经加载完毕，可供访问了。

That's _preloading_.

这就是*预加载*。

{@a how-preloading}

#### How preloading works

#### 预加载的工作原理

After each _successful_ navigation, the router looks in its configuration for an unloaded module that it can preload.
Whether it preloads a module, and which modules it preloads, depends upon the *preload strategy*.

在每次*成功的*导航后，路由器会在自己的配置中查找尚未加载并且可以预加载的模块。
是否加载某个模块，以及要加载哪些模块，取决于*预加载策略*。

The `Router` offers two preloading strategies out of the box:

`Router` 内置了两种预加载策略：

* No preloading at all which is the default. Lazy loaded feature areas are still loaded on demand.

   完全不预加载，这是默认值。惰性加载的特性区仍然会按需加载。

* Preloading of all lazy loaded feature areas.

   预加载所有惰性加载的特性区。

Out of the box, the router either never preloads, or preloads every lazy load module.
The `Router` also supports [custom preloading strategies](#custom-preloading) for
fine control over which modules to preload and when.

默认情况下，路由器或者完全不预加载或者预加载每个惰性加载模块。
路由器还支持[自定义预加载策略](guide/router#custom-preloading)，以便完全控制要预加载哪些模块以及何时加载。

In this next section, you'll update the `CrisisCenterModule` to load lazily
by default and use the `PreloadAllModules` strategy
to load it (and _all other_ lazy loaded modules) as soon as possible.

在下一节，你将会把 `CrisisCenterModule` 改为默认惰性加载的，并使用 `PreloadAllModules` 策略来尽快加载它（以及*所有其它*惰性加载模块）。

{@a lazy-load-crisis-center}

#### Lazy load the _crisis center_

#### 惰性加载*危机中心*

Update the route configuration to lazy load the `CrisisCenterModule`.
Take the same steps you used to configure `AdminModule` for lazy load.

修改路由配置，来惰性加载 `CrisisCenterModule`。修改的步骤和配置惰性加载 `AdminModule` 时一样。

1. Change the `crisis-center` path in the `CrisisCenterRoutingModule` to an empty string.

   把 `CrisisCenterRoutingModule` 中的路径从 `crisis-center` 改为空字符串。

1. Add a `crisis-center` route to the `AppRoutingModule`.

   往 `AppRoutingModule` 中添加一个 `crisis-center` 路由。

1. Set the `loadChildren` string to load the `CrisisCenterModule`.

   设置 `loadChildren` 字符串来加载 `CrisisCenterModule`。

1. Remove all mention of the `CrisisCenterModule` from `app.module.ts`.

   从 `app.module.ts` 中移除所有对 `CrisisCenterModule` 的引用。

Here are the updated modules _before enabling preload_:

下面是打开预加载之前的模块修改版：

<code-tabs>

  <code-pane header="app.module.ts" path="router/src/app/app.module.ts" region="preload">

  </code-pane>

  <code-pane header="app-routing.module.ts" path="router/src/app/app-routing.module.6.ts" region="preload-v1">

  </code-pane>

  <code-pane header="crisis-center-routing.module.ts" path="router/src/app/crisis-center/crisis-center-routing.module.ts">

  </code-pane>

</code-tabs>

You could try this now and confirm that the  `CrisisCenterModule` loads after you click the "Crisis Center" button.

你可以现在尝试它，并确认在点击了“Crisis Center”按钮之后加载了 `CrisisCenterModule`。

To enable preloading of all lazy loaded modules, import the `PreloadAllModules` token from the Angular router package.

要为所有惰性加载模块启用预加载功能，请从 Angular 的路由模块中导入 `PreloadAllModules`。

The second argument in the `RouterModule.forRoot()` method takes an object for additional configuration options.
The `preloadingStrategy` is one of those options.
Add the `PreloadAllModules` token to the `forRoot()` call:

`RouterModule.forRoot()` 方法的第二个参数接受一个附加配置选项对象。
`preloadingStrategy` 就是其中之一。
把 `PreloadAllModules` 添加到 `forRoot()` 调用中：

<code-example path="router/src/app/app-routing.module.6.ts" header="src/app/app-routing.module.ts (preload all)" region="forRoot"></code-example>

This tells the `Router` preloader to immediately load _all_ lazy loaded routes (routes with a `loadChildren` property).

这会让 `Router` 预加载器立即加载*所有*惰性加载路由（带 `loadChildren` 属性的路由）。

When you visit `http://localhost:4200`, the `/heroes` route loads immediately upon launch
and the router starts loading the `CrisisCenterModule` right after the `HeroesModule` loads.

当访问 `http://localhost:4200` 时，`/heroes` 路由立即随之启动，并且路由器在加载了 `HeroesModule` 之后立即开始加载 `CrisisCenterModule`。

Surprisingly, the `AdminModule` does _not_ preload. Something is blocking it.

意外的是，`AdminModule`*没有*预加载，有什么东西阻塞了它。

{@a preload-canload}

#### CanLoad blocks preload

#### CanLoad 会阻塞预加载

The `PreloadAllModules` strategy does not load feature areas protected by a [CanLoad](#can-load-guard) guard.
This is by design.

`PreloadAllModules` 策略不会加载被[CanLoad](guide/router#can-load-guard)守卫所保护的特性区。这是刻意设计的。

You added a `CanLoad` guard to the route in the `AdminModule` a few steps back
to block loading of that module until the user is authorized.
That `CanLoad` guard takes precedence over the preload strategy.

你几步之前刚刚给 `AdminModule` 中的路由添加了 `CanLoad` 守卫，以阻塞加载那个模块，直到用户认证结束。
`CanLoad` 守卫的优先级高于预加载策略。

If you want to preload a module _and_ guard against unauthorized access,
drop the `canLoad()` guard method and rely on the [canActivate()](#can-activate-guard) guard alone.

如果你要加载一个模块*并且*保护它防止未授权访问，请移除 `canLoad` 守卫，只单独依赖[CanActivate](guide/router#can-activate-guard)守卫。

{@a custom-preloading}

### Custom Preloading Strategy

### 自定义预加载策略

Preloading every lazy loaded modules works well in many situations,
but it isn't always the right choice, especially on mobile devices and over low bandwidth connections.
You may choose to preload only certain feature modules, based on user metrics and other business and technical factors.

在大多数场景下，预加载每个惰性加载模块就很好了，但是有时候它却并不是正确的选择，特别是在移动设备和低带宽连接下。
你可能出于用户的测量和其它商业和技术因素而选择只对某些特性模块进行预加载。

You can control what and how the router preloads with a custom preloading strategy.

使用自定义预加载策略，你可以控制路由器预加载哪些路由以及如何加载。

In this section, you'll add a custom strategy that _only_ preloads routes whose `data.preload` flag is set to `true`.
Recall that you can add anything to the `data` property of a route.

在这一节，你将添加一个自定义策略，它*只*预加载那些 `data.preload` 标志为 `true` 的路由。
回忆一下，你可以往路由的 `data` 属性中添加任何东西。

Set the `data.preload` flag in the `crisis-center` route in the `AppRoutingModule`.

在 `AppRoutingModule` 的 `crisis-center` 路由中设置 `data.preload` 标志。

<code-example path="router/src/app/app-routing.module.ts" header="src/app/app-routing.module.ts (route data preload)" region="preload-v2"></code-example>

Generate a new `SelectivePreloadingStrategy` service.

生成一个新的 `SelectivePreloadingStrategy` 服务。

<code-example language="none" class="code-shell">
  ng generate service selective-preloading-strategy
</code-example>

<code-example path="router/src/app/selective-preloading-strategy.service.ts" header="src/app/selective-preloading-strategy.service.ts (excerpt)"></code-example>


`SelectivePreloadingStrategyService` implements the `PreloadingStrategy`, which has one method, `preload`.

`SelectivePreloadingStrategyService` 实现了 `PreloadingStrategy`，它只有一个方法 `preload`。

The router calls the `preload` method with two arguments:

路由器会用两个参数调用调用 `preload` 方法：

1. The route to consider.

   要加载的路由。

1. A loader function that can load the routed module asynchronously.

   一个加载器（loader）函数，它能异步加载带路由的模块。

An implementation of `preload` must return an `Observable`.
If the route should preload, it returns the observable returned by calling the loader function.
If the route should _not_ preload, it returns an `Observable` of `null`.

`preload` 的实现必须返回一个 `Observable`。
如果该路由应该预加载，它就会返回调用加载器函数所返回的 `Observable`。
如果该路由*不*应该预加载，它就返回一个 `null` 值的 `Observable` 对象。

In this sample, the  `preload` method loads the route if the route's `data.preload` flag is truthy.

在这个例子中，`preload` 方法只有在路由的 `data.preload` 标识为真时才会加载该路由。

It also has a side-effect.
`SelectivePreloadingStrategyService` logs the `path` of a selected route in its public `preloadedModules` array.

它还有一个副作用。
`SelectivePreloadingStrategyService` 会把所选路由的 `path` 记录在它的公共数组 `preloadedModules` 中。

Shortly, you'll extend the `AdminDashboardComponent` to inject this service and display its `preloadedModules` array.

很快，你就会扩展 `AdminDashboardComponent` 来注入该服务，并且显示它的 `preloadedModules` 数组。

But first, make a few changes to the `AppRoutingModule`.

但是首先，要对 `AppRoutingModule` 做少量修改。

1. Import `SelectivePreloadingStrategyService` into `AppRoutingModule`.

   把 `SelectivePreloadingStrategyService` 导入到 `AppRoutingModule` 中。

1. Replace the `PreloadAllModules` strategy in the call to `forRoot()` with this `SelectivePreloadingStrategyService`.

   把 `PreloadAllModules` 策略替换成对 `forRoot()` 的调用，并且传入这个 `SelectivePreloadingStrategyService`。

1. Add the `SelectivePreloadingStrategyService` strategy to the `AppRoutingModule` providers array so it can be injected
elsewhere in the app.

   把 `SelectivePreloadingStrategyService` 策略添加到 `AppRoutingModule` 的 `providers` 数组中，以便它可以注入到应用中的任何地方。

Now edit the `AdminDashboardComponent` to display the log of preloaded routes.

现在，编辑 `AdminDashboardComponent` 以显示这些预加载路由的日志。

1. Import the `SelectivePreloadingStrategyService`.

   导入 `SelectivePreloadingStrategyService`（它是一个服务）。

1. Inject it into the dashboard's constructor.

   把它注入到仪表盘的构造函数中。

1. Update the template to display the strategy service's `preloadedModules` array.

   修改模板来显示这个策略服务的 `preloadedModules` 数组。

When you're done it looks like this.

当完成时，代码如下：

<code-example path="router/src/app/admin/admin-dashboard/admin-dashboard.component.ts" header="src/app/admin/admin-dashboard/admin-dashboard.component.ts (preloaded modules)"></code-example>

Once the application loads the initial route, the `CrisisCenterModule` is preloaded.
Verify this by logging in to the `Admin` feature area and noting that the `crisis-center` is listed in the `Preloaded Modules`.
It's also logged to the browser's console.

一旦应用加载完了初始路由，`CrisisCenterModule` 也被预加载了。
通过 `Admin` 特性区中的记录就可以验证它，“Preloaded Modules”中列出了 `crisis-center`。
它也被记录到了浏览器的控制台。

{@a redirect-advanced}

## Migrating URLs with Redirects

## 使用重定向迁移 URL

You've setup the routes for navigating around your application. You've used navigation imperatively and declaratively to many different routes. But like any application, requirements change over time. You've setup links and navigation to `/heroes` and `/hero/:id` from the `HeroListComponent` and `HeroDetailComponent` components. If there was a requirement that links to `heroes` become `superheroes`, you still want the previous URLs to navigate correctly. You also don't want to go and update every link in your application, so redirects makes refactoring routes trivial.

你已经设置好了路由，并且用命令式和声明式的方式导航到了很多不同的路由。但是，任何应用的需求都会随着时间而改变。
你把链接 `/heroes` 和 `hero/:id` 指向了 `HeroListComponent` 和 `HeroDetailComponent` 组件。
如果有这样一个需求，要把链接 `heroes` 变成 `superheroes`，你仍然希望以前的 URL 能正常导航。
但你也不想在应用中找到并修改每一个链接，这时候，重定向就可以省去这些琐碎的重构工作。

{@a url-refactor}

### Changing /heroes to /superheroes

### 把 `/heroes` 修改为 `/superheros`

Let's take the `Hero` routes and migrate them to new URLs. The `Router` checks for redirects in your configuration before navigating, so each redirect is triggered when needed. To support this change, you'll add redirects from the old routes to the new routes in the `heroes-routing.module`.

先取得 `Hero` 路由，并把它们迁移到新的 URL。`Router`（路由器）会在开始导航之前先在配置中检查所有重定向语句，以便将来按需触发重定向。要支持这种修改，你就要在 `heroes-routing.module` 文件中把老的路由重定向到新的路由。

<code-example path="router/src/app/heroes/heroes-routing.module.ts" header="src/app/heroes/heroes-routing.module.ts (heroes redirects)"></code-example>

You'll notice two different types of redirects. The first change is from  `/heroes` to `/superheroes` without any parameters. This is a straightforward redirect, unlike the change from `/hero/:id` to `/superhero/:id`, which includes the `:id` route parameter. Router redirects also use powerful pattern matching, so the `Router` inspects the URL and replaces route parameters in the `path` with their appropriate destination. Previously, you navigated to a URL such as `/hero/15` with a route parameter `id` of `15`.

注意，这里有两种类型的重定向。第一种是不带参数的从 `/heroes` 重定向到 `/superheroes`。这是一种非常直观的重定向。第二种是从 `/hero/:id` 重定向到 `/superhero/:id`，它还要包含一个 `:id` 路由参数。
路由器重定向时使用强大的模式匹配功能，这样，路由器就会检查 URL，并且把 `path` 中带的路由参数替换成相应的目标形式。以前，你导航到形如 `/hero/15` 的 URL 时，带了一个路由参数 `id`，它的值是 `15`。

<div class="alert is-helpful">

The `Router` also supports [query parameters](#query-parameters) and the [fragment](#fragment) when using redirects.

在重定向的时候，路由器还支持[查询参数](#query-parameters)和[片段(fragment)](#fragment)。

* When using absolute redirects, the `Router` will use the query parameters and the fragment from the redirectTo in the route config.

   当使用绝对地址重定向时，路由器将会使用路由配置的 `redirectTo` 属性中规定的查询参数和片段。

* When using relative redirects, the `Router` use the query params and the fragment from the source URL.

   当使用相对地址重定向时，路由器将会使用源地址（跳转前的地址）中的查询参数和片段。

</div>

Before updating the `app-routing.module.ts`, you'll need to consider an important rule. Currently, our empty path route redirects to `/heroes`, which redirects to `/superheroes`. This _won't_ work and is by design as the `Router` handles redirects once at each level of routing configuration. This prevents chaining of redirects, which can lead to endless redirect loops.

在修改 `app-routing.module.ts` 之前，你要先考虑一条重要的规则。
目前，你把空路径路由重定向到了 `/heroes`，它又被重定向到了 `/superheroes`。这样*不行*，从设计上就不行。
因为路由器在每一层的路由配置中只会处理一次重定向。这样可以防止出现无限循环的重定向。

So instead, you'll update the empty path route in `app-routing.module.ts` to redirect to `/superheroes`.

所以，你要在 `app-routing.module.ts` 中修改空路径路由，让它重定向到 `/superheroes`。

<code-example path="router/src/app/app-routing.module.ts" header="src/app/app-routing.module.ts (superheroes redirect)"></code-example>

`RouterLink`s aren't tied to route configuration, so you'll need to update the associated router links so they remain active when the new route is active. You'll update the `app.component.ts` template for the `/heroes` routerLink.

由于 `RouterLink` 指令没有关联到路由配置，所以你需要修改相关的路由链接，以便在新的路由激活时，它们也能保持激活状态。你要修改 `app.component.ts` 模板中的 `/heroes` 路由链接。

<code-example path="router/src/app/app.component.html" header="src/app/app.component.html (superheroes active routerLink)"></code-example>

Update the `goToHeroes()` method in the `hero-detail.component.ts` to navigate back to `/superheroes` with the optional route parameters.

修改 `hero-detail.component.ts` 中的 `goToHeroes()` 方法，使用可选的路由参数导航回 `/superheroes`。

<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.ts" region="redirect" header="src/app/heroes/hero-detail/hero-detail.component.ts (goToHeroes)"></code-example>

With the redirects setup, all previous routes now point to their new destinations and both URLs still function as intended.

当这些重定向设置好之后，所有以前的路由都指向了它们的新目标，并且每个 URL 也仍然能正常工作。

{@a inspect-config}

## Inspect the router's configuration

## 审查路由器配置

You put a lot of effort into configuring the router in several routing module files
and were careful to list them [in the proper order](#routing-module-order).
Are routes actually evaluated as you planned?
How is the router really configured?

你把大量的精力投入到在一系列路由模块文件里配置路由器上，并且小心的[以合适的顺序](guide/router#routing-module-order)列出它们。
这些路由是否真的如同你预想的那样执行了？
路由器的真实配置是怎样的？

You can inspect the router's current configuration any time by injecting it and
examining its `config` property.
For example, update the `AppModule` as follows and look in the browser console window
to see the finished route configuration.

通过注入它（Router）并检查它的 `config` 属性，你可以随时审查路由器的当前配置。
例如，把 `AppModule` 修改为这样，并在浏览器的控制台窗口中查看最终的路由配置。

<code-example path="router/src/app/app.module.7.ts" header="src/app/app.module.ts (inspect the router config)" region="inspect-config"></code-example>

{@a final-app}

## Wrap up and final app

## 总结与最终的应用

You've covered a lot of ground in this guide and the application is too big to reprint here.
Please visit the <live-example title="Router Sample in Stackblitz"></live-example>
where you can download the final source code.

本章中涉及到了很多背景知识，而且本应用程序也太大了，所以没法在这里显示。请访问<live-example title="Router Sample in Stackblitz"></live-example>，在那里你可以下载最终的源码。

{@a appendices}

## Appendices

## 附录

The balance of this guide is a set of appendices that
elaborate some of the points you covered quickly above.

本章剩下的部分是一组附录，它详尽阐述了那些曾匆匆带过的知识点。

The appendix material isn't essential. Continued reading is for the curious.

该附件中的内容不是必须的，感兴趣的人才需要阅读它。

{@a link-parameters-array}

### Appendix: link parameters array

### 附录：链接参数数组

A link parameters array holds the following ingredients for router navigation:

链接参数数组保存路由导航时所需的成分：

* The *path* of the route to the destination component.

   指向目标组件的那个路由的*路径（path）*

* Required and optional route parameters that go into the route URL.

   必备路由参数和可选路由参数，它们将进入该路由的 URL

You can bind the `RouterLink` directive to such an array like this:

你可以把 `RouterLink` 指令绑定到一个数组，就像这样：

<code-example path="router/src/app/app.component.3.ts" header="src/app/app.component.ts (h-anchor)" region="h-anchor"></code-example>

You've written a two element array when specifying a route parameter like this:

在指定路由参数时，你写过一个双元素的数组，就像这样：

<code-example path="router/src/app/heroes/hero-list/hero-list.component.1.html" header="src/app/heroes/hero-list/hero-list.component.html (nav-to-detail)" region="nav-to-detail"></code-example>

You can provide optional route parameters in an object like this:

你可以在对象中提供可选的路由参数，就像这样：

<code-example path="router/src/app/app.component.3.ts" header="src/app/app.component.ts (cc-query-params)" region="cc-query-params"></code-example>

These three examples cover the need for an app with one level routing.
The moment you add a child router, such as the crisis center, you create new link array possibilities.

这三个例子涵盖了你在单级路由的应用中所需的一切。在你添加一个像*危机中心*一样的子路由时，你可以创建新链接数组。

Recall that you specified a default child route for the crisis center so this simple `RouterLink` is fine.

回忆一下，你曾为*危机中心*指定过一个默认的子路由，以便能使用这种简单的 `RouterLink`。

<code-example path="router/src/app/app.component.3.ts" header="src/app/app.component.ts (cc-anchor-w-default)" region="cc-anchor-w-default"></code-example>

Parse it out.

分解一下。

* The first item in the array identifies the parent route (`/crisis-center`).

   数组中的第一个条目标记出了父路由(`/crisis-center`)。

* There are no parameters for this parent route so you're done with it.

   这个父路由没有参数，因此这步已经完成了。

* There is no default for the child route so you need to pick one.

   没有默认的子路由，因此你得选取一个。

* You're navigating to the `CrisisListComponent`, whose route path is `/`, but you don't need to explicitly add the slash.

   你决定跳转到 `CrisisListComponent`，它的路由路径是'/'，但你不用显式的添加它。

* Voilà! `['/crisis-center']`.

   哇！`['/crisis-center']`。

Take it a step further. Consider the following router link that
navigates from the root of the application down to the *Dragon Crisis*:

更进一步。这次要构建一个从根组件往下导航到“巨龙危机”时的链接参数数组：

<code-example path="router/src/app/app.component.3.ts" header="src/app/app.component.ts (Dragon-anchor)" region="Dragon-anchor"></code-example>

* The first item in the array identifies the parent route (`/crisis-center`).

   数组中的第一个条目标记出了父路由(`/crisis-center`)。

* There are no parameters for this parent route so you're done with it.

   这个父路由没有参数，因此这步已经完成了。

* The second item identifies the child route details about a particular crisis (`/:id`).

   数组中的第二个条目（'/:id'）用来标记出到指定危机的详情页的子路由。

* The details child route requires an `id` route parameter.

   详细的子路由需要一个 `id` 路由参数。

* You added the `id` of the *Dragon Crisis* as the second item in the array (`1`).

   你把*巨龙危机*的 `id` 添加为该数组中的第二个条目（`1`）。

* The resulting path is `/crisis-center/1`.

   最终生成的路径是 `/crisis-center/1`。

If you wanted to, you could redefine the `AppComponent` template with *Crisis Center* routes exclusively:

只要想，你也可以用*危机中心*路由单独重定义 `AppComponent` 的模板：

<code-example path="router/src/app/app.component.3.ts" header="src/app/app.component.ts (template)" region="template"></code-example>

In sum, you can write applications with one, two or more levels of routing.
The link parameters array affords the flexibility to represent any routing depth and
any legal sequence of route paths, (required) router parameters, and (optional) route parameter objects.

总结：你可以用一级、两级或多级路由来写应用程序。
  链接参数数组提供了用来表示任意深度路由的链接参数数组以及任意合法的路由参数序列、必须的路由器参数以及可选的路由参数对象。

{@a browser-url-styles}

{@a location-strategy}

### Appendix: *LocationStrategy* and browser URL styles

### 附录：*LocationStrategy* 以及浏览器 URL 样式

When the router navigates to a new component view, it updates the browser's location and history
with a URL for that view.
This is a strictly local URL. The browser shouldn't send this URL to the server
and should not reload the page.

当路由器导航到一个新的组件视图时，它会用该视图的 URL 来更新浏览器的当前地址以及历史。
严格来说，这个 URL 其实是本地的，浏览器不会把该 URL 发给服务器，并且不会重新加载此页面。

Modern HTML5 browsers support
<a href="https://developer.mozilla.org/en-US/docs/Web/API/History_API#Adding_and_modifying_history_entries" title="HTML5 browser history push-state">history.pushState</a>,
a technique that changes a browser's location and history without triggering a server page request.
The router can compose a "natural" URL that is indistinguishable from
one that would otherwise require a page load.

现代 HTML 5 浏览器支持[history.pushState](https://developer.mozilla.org/en-US/docs/Web/API/History_API#Adding_and_modifying_history_entries) API，
这是一项可以改变浏览器的当前地址和历史，却又不会触发服务端页面请求的技术。
路由器可以合成出一个“自然的”URL，它看起来和那些需要进行页面加载的 URL 没什么区别。

Here's the *Crisis Center* URL in this "HTML5 pushState" style:

下面是*危机中心*的 URL 在“HTML 5 pushState”风格下的样子：

<code-example format="nocode">
  localhost:3002/crisis-center/

</code-example>

Older browsers send page requests to the server when the location URL changes
_unless_ the change occurs after a "#" (called the "hash").
Routers can take advantage of this exception by composing in-application route
URLs with hashes. Here's a "hash URL" that routes to the *Crisis Center*.

老旧的浏览器在当前地址的 URL 变化时总会往服务器发送页面请求……唯一的例外规则是：当这些变化位于“#”（被称为“hash”）后面时不会发送。通过把应用内的路由 URL 拼接在 `#` 之后，路由器可以获得这条“例外规则”带来的优点。下面是到*危机中心*路由的“hash URL”：

<code-example format="nocode">
  localhost:3002/src/#/crisis-center/

</code-example>

The router supports both styles with two `LocationStrategy` providers:

路由器通过两种 `LocationStrategy` 提供商来支持所有这些风格：

1. `PathLocationStrategy`&mdash;the default "HTML5 pushState" style.

   `PathLocationStrategy` - 默认的策略，支持“HTML 5 pushState”风格。

1. `HashLocationStrategy`&mdash;the "hash URL" style.

   `HashLocationStrategy` - 支持“hash URL”风格。

The `RouterModule.forRoot()` function sets the `LocationStrategy` to the `PathLocationStrategy`,
making it the default strategy.
You can switch to the `HashLocationStrategy` with an override during the bootstrapping process if you prefer it.

`RouterModule.forRoot()` 函数把 `LocationStrategy` 设置成了 `PathLocationStrategy`，使其成为了默认策略。
你可以在启动过程中改写（override）它，来切换到 `HashLocationStrategy` 风格 —— 如果你更喜欢这种。

<div class="alert is-helpful">

Learn about providers and the bootstrap process in the
[Dependency Injection guide](guide/dependency-injection#bootstrap).

要学习关于“提供商”和启动过程的更多知识，参见[依赖注入](guide/dependency-injection#bootstrap)一章。

</div>

#### Which strategy is best?

#### 哪种策略更好？

You must choose a strategy and you need to make the right call early in the project.
It won't be easy to change later once the application is in production
and there are lots of application URL references in the wild.

你必须选择一种策略，并且在项目的早期就这么干。一旦该应用进入了生产阶段，要改起来可就不容易了，因为外面已经有了大量对应用 URL 的引用。

Almost all Angular projects should use the default HTML5 style.
It produces URLs that are easier for users to understand.
And it preserves the option to do _server-side rendering_ later.

几乎所有的 Angular 项目都会使用默认的 HTML 5 风格。它生成的 URL 更易于被用户理解，它也为将来做**服务端渲染**预留了空间。

Rendering critical pages on the server is a technique that can greatly improve
perceived responsiveness when the app first loads.
An app that would otherwise take ten or more seconds to start
could be rendered on the server and delivered to the user's device
in less than a second.

在服务器端渲染指定的页面，是一项可以在该应用首次加载时大幅提升响应速度的技术。那些原本需要十秒甚至更长时间加载的应用，可以预先在服务端渲染好，并在少于一秒的时间内完整呈现在用户的设备上。

This option is only available if application URLs look like normal web URLs
without hashes (#) in the middle.

只有当应用的 URL 看起来像是标准的 Web URL，中间没有 hash（#）时，这个选项才能生效。

Stick with the default unless you have a compelling reason to
resort to hash routes.

除非你有强烈的理由不得不使用 hash 路由，否则就应该坚决使用默认的 HTML 5 路由风格。


#### The *&lt;base href>*

#### *&lt;base href>* 标签

The router uses the browser's
<a href="https://developer.mozilla.org/en-US/docs/Web/API/History_API#Adding_and_modifying_history_entries" title="HTML5 browser history push-state">history.pushState</a>
for navigation. Thanks to `pushState`, you can make in-app URL paths look the way you want them to
look, e.g. `localhost:4200/crisis-center`. The in-app URLs can be indistinguishable from server URLs.

路由器使用浏览器的 <a href="https://developer.mozilla.org/en-US/docs/Web/API/History_API#Adding_and_modifying_history_entries" title="HTML5 browser history push-state">history.pushState</a> API 进行导航。借助 `pushState` 你可以让应用中的 URL 路径看上去就像你期望的那样，比如 `localhost:4200/crisis-center`，应用内的 URL 和服务器的 URL 没有区别。

Modern HTML5 browsers were the first to support `pushState` which is why many people refer to these URLs as
"HTML5 style" URLs.

现代的 HTML5 浏览器都支持 `pushState`，这也就是为什么很多人把这种 URL 形式称为 "HTML 5" 风格的 URL。

<div class="alert is-helpful">


HTML5 style navigation is the router default.
In the [LocationStrategy and browser URL styles](#browser-url-styles) Appendix,
learn why HTML5 style is preferred, how to adjust its behavior, and how to switch to the
older hash (#) style, if necessary.


路由器默认使用 HTML5 风格的导航。
在附录中的 [LocationStrategy 与浏览器 URL 风格](#browser-url-styles)中，你可以了解为何推荐使用 HTML5 风格的 URL，如何调整其行为，以及必要时如何切换到老式的 hash（#）风格。

</div>


You must **add a
<a href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base" title="base href">&lt;base href&gt; element</a>**
to the app's `index.html` for `pushState` routing to work.
The browser uses the `<base href>` value to prefix *relative* URLs when referencing
CSS files, scripts, and images.

你必须在应用的 `index.html` 中**添加一个 <a href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base" title="base href">&lt;base href&gt; 元素</a>**才能让 `pushState` 路由正常工作。
浏览器要用 `<base href>` 的值为引用 CSS、脚本和图片文件时使用的*相对* URL 添加前缀。

Add the `<base>` element just after the  `<head>` tag.
If the `app` folder is the application root, as it is for this application,
set the `href` value in **`index.html`** *exactly* as shown here.

请把 `<base>` 元素添加在 `<head>` 标签的紧后面。如果应用的根目录是 `app` 目录，那么就可以像这个应用程序一样，设置 **`index.html`** 中的 `href` 值。代码如下。

<code-example path="router/src/index.html" header="src/index.html (base-href)" region="base-href"></code-example>

#### HTML5 URLs and the  *&lt;base href>*

#### HTML 5 URL 与*&lt;base href>*

While the router uses the
<a href="https://developer.mozilla.org/en-US/docs/Web/API/History_API#Adding_and_modifying_history_entries" title="Browser history push-state">HTML5 pushState</a>
style by default, you *must* configure that strategy with a **base href**.

由于路由器默认使用“<a href="https://developer.mozilla.org/en-US/docs/Web/API/History_API#Adding_and_modifying_history_entries" target="_blank" title="Browser history push-state">HTML 5 pushState</a>”风格，所以你*必须*用一个**base href**来配置该策略（Strategy）。

The preferred way to configure the strategy is to add a
<a href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base" title="base href">&lt;base href&gt; element</a>
tag in the `<head>` of the `index.html`.

配置该策略的首选方式是往 `index.html` 的 `<head>` 中添加一个[&lt;base href> element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base)标签。

<code-example path="router/src/index.html" header="src/index.html (base-href)" region="base-href"></code-example>

Without that tag, the browser may not be able to load resources
(images, CSS, scripts) when "deep linking" into the app.
Bad things could happen when someone pastes an application link into the
browser's address bar or clicks such a link in an email.

如果没有此标签，当通过“深链接”进入该应用时，浏览器就不能加载资源（图片、CSS、脚本）。如果有人把应用的链接粘贴进浏览器的地址栏或从邮件中点击应用的链接时，这种问题就发生。

Some developers may not be able to add the `<base>` element, perhaps because they don't have
access to `<head>` or the `index.html`.

有些开发人员可能无法添加 `<base>` 元素，这可能是因为它们没有访问 `<head>` 或 `index.html` 的权限。

Those developers may still use HTML5 URLs by taking two remedial steps:

它们仍然可以使用 HTML 5 格式的 URL，但要采取两个步骤进行补救：

1. Provide the router with an appropriate [APP_BASE_HREF][] value.

   用适当的[APP_BASE_HREF][]值提供（provide）路由器。

1. Use _root URLs_ for all web resources: CSS, images, scripts, and template HTML files.

   对所有 Web 资源使用**绝对地址**：CSS、图片、脚本、模板 HTML。

{@a hashlocationstrategy}

#### *HashLocationStrategy*

#### *HashLocationStrategy* 策略

You can go old-school with the `HashLocationStrategy` by
providing the `useHash: true` in an object as the second argument of the `RouterModule.forRoot()`
in the `AppModule`.

你可以在根模块的 `RouterModule.forRoot()` 的第二个参数中传入一个带有 `useHash: true` 的对象，以回到基于 `HashLocationStrategy` 的传统方式。

<code-example path="router/src/app/app.module.6.ts" header="src/app/app.module.ts (hash URL strategy)"></code-example>
-												docs: apply standard header case convention (#34196)

PR Close #34196

											
										
										
											2019-12-02 12:47:19 -08:00
+								# Routing and navigation
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cb-index.md
#	aio/content/guide/change-log.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/cli-quickstart.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/dynamic-form.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/index.md
#	aio/content/guide/learning-angular.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/pipes.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/security.md
#	aio/content/guide/server-communication.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/ts-to-js.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/webpack.md
#	aio/content/navigation.json
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/styles/main.scss
#	aio/transforms/angular.io-package/index.js

											
										
										
											2017-07-30 00:03:22 +08:00
+								# 路由与导航
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
 								The Angular **`Router`** enables navigation from one [view](guide/glossary#view) to the next
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								as users perform application tasks.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								在用户使用应用程序时，Angular 的***路由器***能让用户从一个[视图](guide/glossary#view)导航到另一个视图。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								This guide covers the router's primary features, illustrating them through the evolution
 								of a small application that you can <live-example>run live in the browser</live-example>.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								本章涵盖了该路由器的主要特性，通过一个小型应用的成长演进来讲解它。参见<live-example></live-example>。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								<!-- style for all tables on this page -->
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								<style>
 								  td, th {vertical-align: top}
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								</style>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								## Overview
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								## 概览
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The browser is a familiar model of application navigation:
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								浏览器具有熟悉的导航模式：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* Enter a URL in the address bar and the browser navigates to a corresponding page.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   在地址栏输入 URL，浏览器就会导航到相应的页面。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* Click links on the page and the browser navigates to a new page.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   在页面中点击链接，浏览器就会导航到一个新页面。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* Click the browser's back and forward buttons and the browser navigates
 								  backward and forward through the history of pages you've seen.
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
 								   点击浏览器的前进和后退按钮，浏览器就会在你的浏览历史中向前或向后导航。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
 								The Angular `Router` ("the router") borrows from this model.
 								It can interpret a browser URL as an instruction to navigate to a client-generated view.
 								It can pass optional parameters along to the supporting view component that help it decide what specific content to present.
 								You can bind the router to links on a page and it will navigate to
 								the appropriate application view when the user clicks a link.
 								You can navigate imperatively when the user clicks a button, selects from a drop box,
 								or in response to some other stimulus from any source. And the router logs activity
 								in the browser's history journal so the back and forward buttons work as well.
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								Angular 的 `Router`（即“路由器”）借鉴了这个模型。它把浏览器中的 URL 看做一个操作指南，
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								  据此导航到一个由客户端生成的视图，并可以把参数传给支撑视图的相应组件，帮它决定具体该展现哪些内容。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								  你可以为页面中的链接绑定一个路由，这样，当用户点击链接时，就会导航到应用中相应的视图。
 								  当用户点击按钮、从下拉框中选取，或响应来自任何地方的事件时，你也可以在代码控制下进行导航。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								  路由器还在浏览器的历史日志中记录下这些活动，这样浏览器的前进和后退按钮也能照常工作。
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a basics}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								## The Basics
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								## 基础知识
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								This guide proceeds in phases, marked by milestones, starting from a simple two-pager
 								and building toward a modular, multi-view design with child routes.
-												微调

											
										
										
											2017-10-01 13:41:29 +08:00
+								本章包括一系列里程碑，从一个单模块、两个页面的简单程序逐步走向带有多个子路由的多视图设计。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								An introduction to a few core router concepts will help orient you to the details that follow.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								先对路由的一些核心概念做一个介绍，它能帮你逐步过渡到细节。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a basics-base-href}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								### *&lt;base href>*
-												fix: translate all pure english titles

											
										
										
											2017-08-04 14:06:15 +08:00
+								### *&lt;base href>* 元素
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Most routing applications should add a `<base>` element to the `index.html` as the first child in the  `<head>` tag
 								to tell the router how to compose navigation URLs.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								大多数带路由的应用都要在**`index.html`**的 `<head>` 标签下先添加一个 `<base>` 元素，来告诉路由器该如何合成导航用的 URL。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								If the `app` folder is the application root, as it is for the sample application,
 								set the `href` value *exactly* as shown here.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								如果 `app` 文件夹是该应用的根目录（就像范例应用中一样），那就把 `href` 的值设置为下面这样：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/index.html" header="src/index.html (base-href)" region="base-href"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a basics-router-imports}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								### Router imports
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 从路由库中导入
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The Angular Router is an optional service that presents a particular component view for a given URL.
 								It is not part of the Angular core. It is in its own library package, `@angular/router`.
 								Import what you need from it as you would from any other Angular package.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								Angular 的路由器是一个可选的服务，它用来呈现指定的 URL 所对应的视图。
 								它并不是 Angular 核心库的一部分，而是在它自己的 `@angular/router` 包中。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								像其它 Angular 包一样，你可以从它导入所需的一切。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.module.1.ts" header="src/app/app.module.ts (import)" region="import-router"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								You'll learn about more options in the [details below](#browser-url-styles).
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你将会在[后面](guide/router#browser-url-styles)学到更多选项。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a basics-config}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								### Configuration
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 配置
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								A routed Angular application has one singleton instance of the *`Router`* service.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								When the browser's URL changes, that router looks for a corresponding `Route`
 								from which it can determine the component to display.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								每个带路由的 Angular 应用都有一个*`Router`（路由器）*服务的单例对象。
 								当浏览器的 URL 变化时，路由器会查找对应的 `Route`（路由），并据此决定该显示哪个组件。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								A router has no routes until you configure it.
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								The following example creates five route definitions, configures the router via the `RouterModule.forRoot()` method,
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								and adds the result to the `AppModule`'s `imports` array.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								路由器需要先配置才会有路由信息。
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								下面的例子创建了五个路由定义，并用 `RouterModule.forRoot()` 方法来配置路由器，
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								并把它的返回值添加到 `AppModule` 的 `imports` 数组中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.module.0.ts" header="src/app/app.module.ts (excerpt)"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a example-config}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `appRoutes` array of *routes* describes how to navigate.
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								Pass it to the `RouterModule.forRoot()` method in the module `imports` to configure the router.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								这里的路由数组 `appRoutes` 描述如何进行导航。
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								把它传给 `RouterModule.forRoot()` 方法并传给本模块的 `imports` 数组就可以配置路由器。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Each `Route` maps a URL `path` to a component.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								There are _no leading slashes_ in the _path_.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The router parses and builds the final URL for you,
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								allowing you to use both relative and absolute paths when navigating between application views.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								每个 `Route` 都会把一个 URL 的 `path` 映射到一个组件。
 								注意，`path` 不能以*斜杠（`/`）*开头。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								路由器会为解析和构建最终的 URL，这样当你在应用的多个视图之间导航时，可以任意使用相对路径和绝对路径。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): Fix reference to the right example

Fix reference to the right example (it's the second route in the example the one showing the route parameter, not the first one)
											
										
										
											2017-04-19 11:30:02 +02:00
+								The `:id` in the second route is a token for a route parameter. In a URL such as `/hero/42`, "42"
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								is the value of the `id` parameter. The corresponding `HeroDetailComponent`
 								will use that value to find and present the hero whose `id` is 42.
 								You'll learn more about route parameters later in this guide.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								第二个路由中的 `:id` 是一个路由参数的令牌(Token)。比如 `/hero/42` 这个 URL 中，“42”就是 `id` 参数的值。
 								此 URL 对应的 `HeroDetailComponent` 组件将据此查找和展现 `id` 为 42 的英雄。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在本章中稍后的部分，你将会学习关于路由参数的更多知识。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `data` property in the third route is a place to store arbitrary data associated with
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								this specific route. The data property is accessible within each activated route. Use it to store
 								items such as page titles, breadcrumb text, and other read-only, _static_ data.
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								You'll use the [resolve guard](#resolve-guard) to retrieve _dynamic_ data later in the guide.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								第三个路由中的 `data` 属性用来存放于每个具体路由有关的任意信息。该数据可以被任何一个激活路由访问，并能用来保存诸如
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								页标题、面包屑以及其它静态只读数据。本章稍后的部分，你将使用[resolve 守卫](guide/router#resolve-guard)来获取动态数据。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Fix some non-code being formatted as code in the router docs

											
										
										
											2017-04-08 16:36:05 +01:00
+								The **empty path** in the fourth route represents the default path for the application,
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								the place to go when the path in the URL is empty, as it typically is at the start.
 								This default route redirects to the route for the `/heroes` URL and, therefore, will display the `HeroesListComponent`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								第四个路由中的空路径（`''`）表示应用的默认路径，当 URL 为空时就会访问那里，因此它通常会作为起点。
 								这个默认路由会重定向到 URL `/heroes`，并显示 `HeroesListComponent`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `**` path in the last route is a **wildcard**. The router will select this route
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								if the requested URL doesn't match any paths for routes defined earlier in the configuration.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								This is useful for displaying a "404 - Not Found" page or redirecting to another route.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								最后一个路由中的 `**` 路径是一个**通配符**。当所请求的 URL 不匹配前面定义的路由表中的任何路径时，路由器就会选择此路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								这个特性可用于显示“404 - Not Found”页，或自动重定向到其它路由。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								**The order of the routes in the configuration matters** and this is by design. The router uses a **first-match wins**
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								strategy when matching routes, so more specific routes should be placed above less specific routes.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								In the configuration above, routes with a static path are listed first, followed by an empty path route,
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								that matches the default route.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The wildcard route comes last because it matches _every URL_ and should be selected _only_ if no other routes are matched first.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								**这些路由的定义顺序**是刻意如此设计的。路由器使用**先匹配者优先**的策略来匹配路由，所以，具体路由应该放在通用路由的前面。在上面的配置中，带静态路径的路由被放在了前面，后面是空路径路由，因此它会作为默认路由。而通配符路由被放在最后面，这是因为它能匹配上*每一个 URL*，因此应该**只有在**前面找不到其它能匹配的路由时才匹配它。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								If you need to see what events are happening during the navigation lifecycle, there is the **enableTracing** option as part of the router's default configuration. This outputs each router event that took place during each navigation lifecycle to the browser console. This should only be used for _debugging_ purposes. You set the `enableTracing: true` option in the object passed as the second argument to the `RouterModule.forRoot()` method.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								如果你想要看到在导航的生命周期中发生过哪些事件，可以使用路由器默认配置中的 **enableTracing** 选项。它会把每个导航生命周期中的事件输出到浏览器的控制台。
 								这应该只用于*调试*。你只需要把 `enableTracing: true` 选项作为第二个参数传给 `RouterModule.forRoot()` 方法就可以了。
-												fix: some untranslated english

											
										
										
											2017-08-06 13:21:34 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a basics-router-outlet}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								### Router outlet
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 路由出口
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								The `RouterOutlet` is a directive from the router library that is used like a component.
 								It acts as a placeholder that marks the spot in the template where the router should
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								display the components for that outlet.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								`RouterOutlet` 是一个来自路由模块中的指令，它的用法类似于组件。
 								它扮演一个占位符的角色，用于在模板中标出一个位置，路由器将会把要显示在这个出口处的组件显示在这里。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								<code-example language="html">
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
+								  &lt;router-outlet>&lt;/router-outlet>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								  &lt;!-- Routed components go here -->
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								</code-example>
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								Given the configuration above, when the browser URL for this application becomes `/heroes`,
 								the router matches that URL to the route path `/heroes` and displays the `HeroListComponent`
 								as a sibling element to the `RouterOutlet` that you've placed in the host component's template.
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								有了这份配置，当本应用在浏览器中的 URL 变为 `/heroes` 时，路由器就会匹配到 `path` 为 `heroes` 的 `Route`，并在宿主视图中的*`RouterOutlet`*之后显示 `HeroListComponent` 组件。
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a basics-router-links}
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								{@a router-link}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								### Router links
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 路由器链接
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Now you have routes configured and a place to render them, but
 								how do you navigate? The URL could arrive directly from the browser address bar.
 								But most of the time you navigate as a result of some user action such as the click of
 								an anchor tag.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								现在，你已经有了配置好的一些路由，还找到了渲染它们的地方，但又该如何导航到它呢？固然，从浏览器的地址栏直接输入 URL 也能做到，但是大多数情况下，导航是某些用户操作的结果，比如点击一个 A 标签。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Consider the following template:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								考虑下列模板：
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.component.1.html" header="src/app/app.component.html"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								The `RouterLink` directives on the anchor tags give the router control over those elements.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The navigation paths are fixed, so you can assign a string to the `routerLink` (a "one-time" binding).
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`a` 标签上的 `RouterLink` 指令让路由器得以控制这个 `a` 元素。
 								这里的导航路径是固定的，因此可以把一个字符串赋给 `routerLink`（“一次性”绑定）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Had the navigation path been more dynamic, you could have bound to a template expression that
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								returned an array of route link parameters (the _link parameters array_).
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The router resolves that array into a complete URL.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								如果需要更加动态的导航路径，那就把它绑定到一个返回*链接参数数组*的模板表达式。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								路由器会把这个数组解析成完整的 URL。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								{@a router-link-active}
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								### Active router links
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								### 路由链接的激活状态
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								The `RouterLinkActive` directive toggles css classes for active `RouterLink` bindings based on the current `RouterState`.
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								`RouterLinkActive` 指令会基于当前的 `RouterState` 为活动的 `RouterLink` 切换所绑定的 css 类。
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								On each anchor tag, you see a [property binding](guide/template-syntax#property-binding) to the `RouterLinkActive` directive that look like `routerLinkActive="..."`.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								在每个 A 标签上，你会看到一个到 `RouterLinkActive` 的[属性绑定](guide/template-syntax#property-binding)，形如 `routerLinkActive="..."`。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								The template expression to the right of the equals (=) contains a space-delimited string of CSS classes
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								that the Router will add when this link is active (and remove when the link is inactive). You set the `RouterLinkActive`
 								directive to a string of classes such as `[routerLinkActive]="'active fluffy'"` or bind it to a component
 								property that returns such a string.
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								等号右边的模板表达式包含一些用空格分隔的 CSS 类名，当这个链接激活时，路由器将会把它们加上去（并在处于非活动状态时移除）。你还可以把 `RouterLinkActive` 设置为一个类组成的字符串，如 `[routerLinkActive]="'active fluffy'"`，或把它绑定到一个返回类似字符串的组件属性。
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								Active route links cascade down through each level of the route tree, so parent and child router links can be active at the same time. To override this behavior, you can bind to the `[routerLinkActiveOptions]` input binding with the `{ exact: true }` expression. By using `{ exact: true }`, a given `RouterLink` will only be active if its URL is an exact match to the current URL.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								路由链接的激活状态会向下级联到路由树中的每个层级，所以，父子路由链接可能会同时激活。要覆盖这种行为，可以把 `[routerLinkActiveOptions]` 绑定为 `{ exact: true }` 表达式，这样 `RouterLink` 只有当 URL 与当前 URL 精确匹配时才会激活。
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a basics-router-state}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								### Router state
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 路由器状态
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								After the end of each successful navigation lifecycle, the router builds a tree of `ActivatedRoute` objects
 								that make up the current state of the router. You can access the current `RouterState` from anywhere in the
 								application using the `Router` service and the `routerState` property.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								在导航时的每个生命周期成功完成时，路由器会构建出一个 `ActivatedRoute` 组成的树，它表示路由器的当前状态。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你可以在应用中的任何地方用 `Router` 服务及其 `routerState` 属性来访问当前的 `RouterState` 值。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Each `ActivatedRoute` in the `RouterState` provides methods to traverse up and down the route tree
 								to get information from parent, child and sibling routes.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								`RouterState` 中的每个 `ActivatedRoute` 都提供了从任意激活路由开始向上或向下遍历路由树的一种方式，以获得关于父、子、兄弟路由的信息。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								{@a activated-route}
 								### Activated route
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
+								### 激活的路由
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								The route path and parameters are available through an injected router service called the
 								[ActivatedRoute](api/router/ActivatedRoute).
 								It has a great deal of useful information including:
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
+								该路由的路径和参数可以通过注入进来的一个名叫[ActivatedRoute](api/router/ActivatedRoute)的路由服务来获取。
 								它有一大堆有用的信息，包括：
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								<table>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <th>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								      Property
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
+								      属性
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </th>
 								    <th>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								      Description
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												fix: 合并第二版的翻译

											
										
										
											2018-03-07 14:35:57 +08:00
+								      说明
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </th>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								  </tr>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								      <code>url</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
 								    An `Observable` of the route path(s), represented as an array of strings for each part of the route path.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								    路由路径的 `Observable` 对象，是一个由路由路径中的各个部分组成的字符串数组。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								  </tr>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								      <code>data</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
 								    An `Observable` that contains the `data` object provided for the route. Also contains any resolved values from the [resolve guard](#resolve-guard).
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								    一个 `Observable`，其中包含提供给路由的 `data` 对象。也包含由[解析守卫（resolve guard）](#resolve-guard)解析而来的值。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								  </tr>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								      <code>paramMap</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
 								    An `Observable` that contains a [map](api/router/ParamMap) of the required and [optional parameters](#optional-route-parameters) specific to the route. The map supports retrieving single and multiple values from the same parameter.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								    一个 `Observable`，其中包含一个由当前路由的必要参数和[可选参数](#optional-route-parameters)组成的[map](api/router/ParamMap)对象。用这个 map 可以获取来自同名参数的单一值或多重值。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								  </tr>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								      <code>queryParamMap</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
 								    An `Observable` that contains a [map](api/router/ParamMap) of the [query parameters](#query-parameters) available to all routes.
 								    The map supports retrieving single and multiple values from the query parameter.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								    一个 `Observable`，其中包含一个对所有路由都有效的[查询参数](#query-parameters)组成的[map](api/router/ParamMap)对象。
 								    用这个 map 可以获取来自查询参数的单一值或多重值。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								  </tr>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								      <code>fragment</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
 								    An `Observable` of the URL [fragment](#fragment) available to all routes.
-												fix: 翻译了所有遗漏的部分。

											
										
										
											2018-03-24 11:16:33 +08:00
+								    一个适用于所有路由的 URL 的 [fragment（片段）](#fragment)的 `Observable`。
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								  </tr>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								      <code>outlet</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
 								    The name of the `RouterOutlet` used to render the route. For an unnamed outlet, the outlet name is _primary_.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								    要把该路由渲染到的 `RouterOutlet` 的名字。对于无名路由，它的路由名是 `primary`，而不是空串。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								  </tr>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								      <code>routeConfig</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
 								    The route configuration used for the route that contains the origin path.
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
+								    用于该路由的路由配置信息，其中包含原始路径。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								  </tr>
 								    <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								      <code>parent</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
 								    The route's parent `ActivatedRoute` when this route is a [child route](#child-routing-component).
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								    当该路由是一个[子路由](#child-routing-component)时，表示该路由的父级 `ActivatedRoute`。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								  </tr>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								      <code>firstChild</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
 								    Contains the first `ActivatedRoute` in the list of this route's child routes.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								    包含该路由的子路由列表中的第一个 `ActivatedRoute`。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								  </tr>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								      <code>children</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    <td>
 								    Contains all the [child routes](#child-routing-component) activated under the current route.
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
+								    包含当前路由下所有已激活的[子路由](#child-routing-component)。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								  </tr>
 								</table>
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
 								Two older properties are still available. They are less capable than their replacements, discouraged, and may be deprecated in a future Angular version.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								有两个旧式属性仍然是有效的，但它们不如其替代品那样强力，建议不再用它们，它们还将在未来的 Angular 版本中废弃。
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
-												fix: sync to 6.0(WIP)

											
										
										
											2018-05-10 13:55:06 +08:00
+								**`params`**&mdash;An `Observable` that contains the required and [optional parameters](#optional-route-parameters) specific to the route. Use `paramMap` instead.
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								**`params`** —— 一个 `Observable` 对象，其中包含当前路由的必要参数和[可选参数](#optional-route-parameters)。请改用 `paramMap`。
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
-												fix: sync to 6.0(WIP)

											
										
										
											2018-05-10 13:55:06 +08:00
+								**`queryParams`**&mdash;An `Observable` that contains the [query parameters](#query-parameters) available to all routes.
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								Use `queryParamMap` instead.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								**`queryParams`** —— 一个 `Observable` 对象，其中包含对所有路由都有效的[查询参数](#query-parameters)。请改用 `queryParamMap`。
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								</div>
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								### Router events
-												fix: translate all pure english titles

											
										
										
											2017-08-04 14:06:15 +08:00
+								### 路由事件
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								During each navigation, the `Router` emits navigation events through the `Router.events` property. These events range from when the navigation starts and ends to many points in between. The full list of navigation events is displayed in the table below.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								在每次导航中，`Router` 都会通过 `Router.events` 属性发布一些导航事件。这些事件的范围涵盖了从开始导航到结束导航之间的很多时间点。下表中列出了全部导航事件：
-												fix: translated the rest of router and structural-directives

											
										
										
											2017-08-05 09:41:33 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								<table>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <th>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								      Router Event
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												fix: translated the rest of router and structural-directives

											
										
										
											2017-08-05 09:41:33 +08:00
+								      路由器事件
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </th>
 								    <th>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								      Description
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												fix: 合并第二版的翻译

											
										
										
											2018-03-07 14:35:57 +08:00
+								      说明
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </th>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  </tr>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								      <code>NavigationStart</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
 								      An [event](api/router/NavigationStart) triggered when navigation starts.
-												fix: translated the rest of router and structural-directives

											
										
										
											2017-08-05 09:41:33 +08:00
+								      本[事件](api/router/NavigationStart)会在导航开始时触发。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
 								  </tr>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								  <tr>
 								    <td>
 								      <code>RouteConfigLoadStart</code>
 								    </td>
 								    <td>
 								      An [event](api/router/RouteConfigLoadStart) triggered before the `Router`
 								      [lazy loads](#asynchronous-routing) a route configuration.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								      本[事件](api/router/RouteConfigLoadStart)会在 `Router` [惰性加载](#asynchronous-routing) 某个路由配置之前触发。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								    </td>
 								  </tr>
 								  <tr>
 								    <td>
 								      <code>RouteConfigLoadEnd</code>
 								    </td>
 								    <td>
 								      An [event](api/router/RouteConfigLoadEnd) triggered after a route has been lazy loaded.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								      本[事件](api/router/RouteConfigLoadEnd)会在惰性加载了某个路由后触发。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  </tr>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								      <code>RoutesRecognized</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
 								      An [event](api/router/RoutesRecognized) triggered when the Router parses the URL and the routes are recognized.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								      本[事件](api/router/RoutesRecognized)会在路由器解析完 URL，并识别出了相应的路由时触发
-												fix: translated the rest of router and structural-directives

											
										
										
											2017-08-05 09:41:33 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  </tr>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      <code>GuardsCheckStart</code>
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
 								    <td>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      An [event](api/router/GuardsCheckStart) triggered when the Router begins the Guards phase of routing.
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								      本[事件](api/router/GuardsCheckStart)会在路由器开始 Guard 阶段之前触发。
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
 								  </tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  <tr>
 								    <td>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      <code>ChildActivationStart</code>
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
 								    <td>
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								      An [event](api/router/ChildActivationStart) triggered when the Router begins activating a route's children.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								      本[事件](api/router/ChildActivationStart)会在路由器开始激活路由的子路由时触发。
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								    </td>
 								  </tr>
 								  <tr>
 								    <td>
 								      <code>ActivationStart</code>
 								    </td>
 								    <td>
 								      An [event](api/router/ActivationStart) triggered when the Router begins activating a route.
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								      本[事件](api/router/ActivationStart)会在路由器开始激活某个路由时触发。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								    </td>
 								  </tr>
 								  <tr>
 								    <td>
 								      <code>GuardsCheckEnd</code>
 								    </td>
 								    <td>
 								      An [event](api/router/GuardsCheckEnd) triggered when the Router finishes the Guards phase of routing successfully.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								      本[事件](api/router/GuardsCheckEnd)会在路由器成功完成了 Guard 阶段时触发。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								    </td>
 								  </tr>
 								  <tr>
 								    <td>
 								      <code>ResolveStart</code>
 								    </td>
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								    <td>
 								      An [event](api/router/ResolveStart) triggered when the Router begins the Resolve phase of routing.
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								      本[事件](api/router/ResolveStart)会在 `Router` 开始解析（Resolve）阶段时触发。
-												fix: translated the rest of router and structural-directives

											
										
										
											2017-08-05 09:41:33 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  </tr>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      <code>ResolveEnd</code>
 								    </td>
 								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      An [event](api/router/ResolveEnd) triggered when the Router finishes the Resolve phase of routing successfuly.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								      本[事件](api/router/ResolveEnd)会在路由器成功完成了路由的解析（Resolve）阶段时触发。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								    </td>
 								  </tr>
 								  <tr>
 								    <td>
 								      <code>ChildActivationEnd</code>
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								      An [event](api/router/ChildActivationEnd) triggered when the Router finishes activating a route's children.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								      本[事件](api/router/ChildActivationEnd)会在路由器激活了路由的子路由时触发。
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								    </td>
 								  </tr>
 								  <tr>
 								    <td>
 								      <code>ActivationEnd</code>
 								    </td>
 								    <td>
 								      An [event](api/router/ActivationStart) triggered when the Router finishes activating a route.
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								      本[事件](api/router/ActivationStart)会在路由器激活了某个路由时触发。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  </tr>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								      <code>NavigationEnd</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
 								      An [event](api/router/NavigationEnd) triggered when navigation ends successfully.
-												fix: translated the rest of router and structural-directives

											
										
										
											2017-08-05 09:41:33 +08:00
+								      本[事件](api/router/NavigationEnd)会在导航成功结束之后触发。
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  </tr>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								      <code>NavigationCancel</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								      An [event](api/router/NavigationCancel) triggered when navigation is canceled.
-												docs: add detail to router event doc (#32140)

PR Close #32140

											
										
										
											2019-08-14 11:04:26 -07:00
+								      This can happen when a [Route Guard](#guards) returns false during navigation,
 								      or redirects by returning a `UrlTree`.
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
-												fix: translated the rest of router and structural-directives

											
										
										
											2017-08-05 09:41:33 +08:00
+								      本[事件](api/router/NavigationCancel)会在导航被取消之后触发。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								      这可能是因为在导航期间某个[路由守卫](#guards)返回了 `false`。
-												fix: translated the rest of router and structural-directives

											
										
										
											2017-08-05 09:41:33 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  </tr>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								      <code>NavigationError</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
 								      An [event](api/router/NavigationError) triggered when navigation fails due to an unexpected error.
-												fix: translated the rest of router and structural-directives

											
										
										
											2017-08-05 09:41:33 +08:00
+								      这个[事件](api/router/NavigationError)会在导航由于意料之外的错误而失败时触发。
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
 								  </tr>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
 								  <tr>
 								    <td>
 								      <code>Scroll</code>
 								    </td>
 								    <td>
 								      An [event](api/router/Scroll) that represents a scrolling event.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								      本[事件](api/router/Scroll)代表一个滚动事件。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  </tr>
 								</table>
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								These events are logged to the console when the `enableTracing` option is enabled also. For an example of filtering router navigation events, visit the [router section](guide/observables-in-angular#router) of the [Observables in Angular](guide/observables-in-angular) guide.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								当启用了 `enableTracing` 选项时，这些事件也同时会记录到控制台中。要想查看对路由导航事件进行过滤的例子，请访问 [Angular 中的可观察对象](guide/observables-in-angular)一章的[路由器部分](guide/observables-in-angular#router)
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
 								{@a basics-summary}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								### Summary
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 总结一下
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The application has a configured router.
 								The shell component has a `RouterOutlet` where it can display views produced by the router.
 								It has `RouterLink`s that users can click to navigate via the router.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								该应用有一个配置过的路由器。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								外壳组件中有一个 `RouterOutlet`，它能显示路由器所生成的视图。
 								它还有一些 `RouterLink`，用户可以点击它们，来通过路由器进行导航。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Here are the key `Router` terms and their meanings:
-												docs(aio): ensure blank lines before HTML blocks in markdown

											
										
										
											2017-03-30 20:04:18 +01:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								下面是一些*路由器*中的关键词汇及其含义：
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								<table>
 								  <tr>
 								    <th>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      Router Part
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      路由器部件
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </th>
 								    <th>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      Meaning
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      含义
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </th>
 								  </tr>
 								  <tr>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      <code>Router</code>
-												fix: 修正自动翻译结果

											
										
										
											2018-03-07 11:25:56 +08:00
-												fix: 合并第二版的翻译

											
										
										
											2018-03-07 14:35:57 +08:00
+								      <code>Router</code>（路由器）
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      Displays the application component for the active URL.
 								      Manages navigation from one component to the next.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								      为激活的 URL 显示应用组件。管理从一个组件到另一个组件的导航
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								  </tr>
 								  <tr>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      <code>RouterModule</code>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      A separate NgModule that provides the necessary service providers
 								      and directives for navigating through application views.
-												fix: 精修翻译

恢复一些过度省略的 "Angular"
Angular 模块恢复为 NgModule

											
										
										
											2019-01-27 22:10:45 +08:00
+								      一个独立的 NgModule，用于提供所需的服务提供商，以及用来在应用视图之间进行导航的指令。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								  </tr>
 								  <tr>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      <code>Routes</code>
-												fix: 修正自动翻译结果

											
										
										
											2018-03-07 11:25:56 +08:00
-												fix: 合并第二版的翻译

											
										
										
											2018-03-07 14:35:57 +08:00
+								      <code>Routes</code>（路由数组）
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      Defines an array of Routes, each mapping a URL path to a component.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								      定义了一个路由数组，每一个都会把一个 URL 路径映射到一个组件。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								  </tr>
 								  <tr>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      <code>Route</code>
-												fix: 修正自动翻译结果

											
										
										
											2018-03-07 11:25:56 +08:00
-												fix: 合并第二版的翻译

											
										
										
											2018-03-07 14:35:57 +08:00
+								      <code>Route</code>（路由）
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      Defines how the router should navigate to a component based on a URL pattern.
 								      Most routes consist of a path and a component type.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								      定义路由器该如何根据 URL 模式（pattern）来导航到组件。大多数路由都由路径和组件类构成。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								  </tr>
 								  <tr>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      <code>RouterOutlet</code>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 合并第二版的翻译

											
										
										
											2018-03-07 14:35:57 +08:00
+								      <code>RouterOutlet</code>（路由出口）
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      The directive (<code>&lt;router-outlet></code>) that marks where the router displays a view.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      该指令（<code>&lt;router-outlet></code>）用来标记出路由器该在哪里显示视图。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								  </tr>
 								  <tr>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      <code>RouterLink</code>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 合并第二版的翻译

											
										
										
											2018-03-07 14:35:57 +08:00
+								      <code>RouterLink</code>（路由链接）
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      The directive for binding a clickable HTML element to
 								      a route. Clicking an element with a <code>routerLink</code> directive
 								      that is bound to a <i>string</i> or a <i>link parameters array</i> triggers a navigation.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 翻译《路由与导航》中遗漏的部分
fix: 把 header 修复成双行对照的格式

											
										
										
											2018-03-14 09:13:52 +08:00
+								      这个指令把可点击的 HTML 元素绑定到某个路由。点击带有 <code>routerLink</code> 指令（绑定到<i>字符串</i>或<i>链接参数数组</i>）的元素时就会触发一次导航。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								  </tr>
 								  <tr>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      <code>RouterLinkActive</code>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 合并第二版的翻译

											
										
										
											2018-03-07 14:35:57 +08:00
+								      <code>RouterLinkActive</code>（活动路由链接）
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      The directive for adding/removing classes from an HTML element when an associated
 								      <code>routerLink</code> contained on or inside the element becomes active/inactive.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								      当 HTML 元素上或元素内的<code>routerLink</code>变为激活或非激活状态时，该指令为这个 HTML 元素添加或移除 CSS 类。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								  </tr>
 								  <tr>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      <code>ActivatedRoute</code>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 合并第二版的翻译

											
										
										
											2018-03-07 14:35:57 +08:00
+								      <code>ActivatedRoute</code>（激活的路由）
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      A service that is provided to each route component that contains route specific
 								      information such as route parameters, static data, resolve data, global query params, and the global fragment.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fixed router page duplicate words.

多了一個提供
											
										
										
											2019-12-25 19:37:30 +08:00
+								      为每个路由组件提供的一个服务，它包含特定于路由的信息，比如路由参数、静态数据、解析数据、全局查询参数和全局碎片（fragment）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								  </tr>
 								  <tr>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      <code>RouterState</code>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 合并第二版的翻译

											
										
										
											2018-03-07 14:35:57 +08:00
+								      <code>RouterState</code>（路由器状态）
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      The current state of the router including a tree of the currently activated
 								      routes together with convenience methods for traversing the route tree.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      路由器的当前状态包含了一棵由程序中激活的路由构成的树。它包含一些用于遍历路由树的快捷方法。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								  </tr>
 								  <tr>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      <b><i>Link parameters array</i></b>
-												fix: 修正自动翻译结果

											
										
										
											2018-03-07 11:25:56 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      <b><i>链接参数数组</i></b>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      An array that the router interprets as a routing instruction.
 								      You can bind that array to a <code>RouterLink</code> or pass the array as an argument to
 								      the <code>Router.navigate</code> method.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								      这个数组会被路由器解释成一个路由操作指南。你可以把一个<code>RouterLink</code>绑定到该数组，或者把它作为参数传给<code>Router.navigate</code>方法。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								  </tr>
 								  <tr>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      <b><i>Routing component</i></b>
-												fix: 修正自动翻译结果

											
										
										
											2018-03-07 11:25:56 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      <b><i>路由组件</i></b>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								      An Angular component with a <code>RouterOutlet</code> that displays views based on router navigations.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								      一个带有<code>RouterOutlet</code>的 Angular 组件，它根据路由器的导航来显示相应的视图。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    </td>
 								  </tr>
 								</table>
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a sample-app-intro}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								## The sample application
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								## 范例应用
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								This guide describes development of a multi-page routed sample application.
 								Along the way, it highlights design decisions and describes key features of the router such as:
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								本章要讲的是如何开发一个带路由的多页面应用。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								接下来会重点讲它的设计决策，并描述路由的关键特性，比如：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Organizing the application features into modules.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   把应用的各个特性组织成模块。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Navigating to a component (*Heroes* link to "Heroes List").
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:15:36 +08:00
+								   导航到组件（*Heroes* 链接到“英雄列表”组件）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Including a route parameter (passing the Hero `id` while routing to the "Hero Detail").
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   包含一个路由参数（当路由到“英雄详情”时，把该英雄的 `id` 传进去）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Child routes (the *Crisis Center* has its own routes).
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   子路由（*危机中心*特性有一组自己的路由）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* The `CanActivate` guard (checking route access).
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   `CanActivate` 守卫（检查路由的访问权限）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* The `CanActivateChild` guard (checking child route access).
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   `CanActivateChild` 守卫（检查子路由的访问权限）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* The `CanDeactivate` guard (ask permission to discard unsaved changes).
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   `CanDeactivate` 守卫（询问是否丢弃未保存的更改）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* The `Resolve` guard (pre-fetching route data).
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   `Resolve` 守卫（预先获取路由数据）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Lazy loading feature modules.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   惰性加载特性模块。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* The `CanLoad` guard (check before loading feature module assets).
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   `CanLoad` 守卫（在加载特性模块之前进行检查）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The guide proceeds as a sequence of milestones as if you were building the app step-by-step.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								But, it is not a tutorial and it glosses over details of Angular application construction
 								that are more thoroughly covered elsewhere in the documentation.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								如果打算一步步构建出本应用，本章就会经过一系列里程碑。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								但是，本章并不是一个教程，它隐藏了构造 Angular 应用的细节，那些细节会在本文档的其它地方展开。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The full source for the final version of the app can be seen and downloaded from the <live-example></live-example>.
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								本应用的最终版源码可以在<live-example></live-example>中查看和下载。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								### The sample application in action
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 范例程序的动图
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Imagine an application that helps the _Hero Employment Agency_ run its business.
 								Heroes need work and the agency finds crises for them to solve.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								假设本程序会用来帮助“英雄管理局”运行他们的业务。
-												Fixed some typos

1.它/她 => 他/她 or other better expression.
2.some of 英雄.+它们 => 英雄.+他们
3.some of 它们.+他们 => 他们.+英雄

											
										
										
											2017-09-19 18:25:56 +08:00
+								英雄们需要找工作，而“英雄管理局”为他们寻找待解决的危机。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The application has three main feature areas:
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								本应用具有三个主要的特性区：
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+. A *Crisis Center* for maintaining the list of crises for assignment to heroes.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
 								   *危机中心*用于维护要指派给英雄的危机列表。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+. A *Heroes* area for maintaining the list of heroes employed by the agency.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
 								   *英雄*区用于维护管理局雇佣的英雄列表。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+. An *Admin* area to manage the list of crises and heroes.
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   *管理*区会管理危机和英雄的列表。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Try it by clicking on this <live-example title="Hero Employment Agency Live Example">live example link</live-example>.
-												fix: 翻译《路由与导航》中遗漏的部分
fix: 把 header 修复成双行对照的格式

											
										
										
											2018-03-14 09:13:52 +08:00
+								点击<live-example title="英雄职介中心的在线例子"></live-example>试用一下。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Once the app warms up, you'll see a row of navigation buttons
 								and the *Heroes* view with its list of heroes.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								等应用热身完毕，你就会看到一排导航按钮，以及一个*英雄列表*视图。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								<div class="lightbox">
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								  <img src='generated/images/guide/router/hero-list.png' alt="Hero List">
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								</div>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Select one hero and the app takes you to a hero editing screen.
-												docs(aio): ensure blank lines before HTML blocks in markdown

											
										
										
											2017-03-30 20:04:18 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								选择其中之一，该应用就会把你带到此英雄的编辑页面。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								<div class="lightbox">
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								  <img src='generated/images/guide/router/hero-detail.png' alt="Crisis Center Detail">
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								</div>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Alter the name.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Click the "Back" button and the app returns to the heroes list which displays the changed hero name.
 								Notice that the name change took effect immediately.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								修改完名字，再点击“后退”按钮，应用又回到了英雄列表页，其中显示的英雄名已经变了。注意，对名字的修改会立即生效。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Had you clicked the browser's back button instead of the "Back" button,
 								the app would have returned you to the heroes list as well.
 								Angular app navigation updates the browser history as normal web navigation does.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								另外你也可以点击浏览器本身的后退按钮，这样也同样会回到英雄列表页。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								在 Angular 应用中导航也会和标准的 Web 导航一样更新浏览器中的历史。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Now click the *Crisis Center* link for a list of ongoing crises.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								现在，点击*危机中心*链接，前往*危机*列表页。
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								<div class="lightbox">
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								  <img src='generated/images/guide/router/crisis-center-list.png' alt="Crisis Center List">
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								</div>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Select a crisis and the application takes you to a crisis editing screen.
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								The _Crisis Detail_ appears in a child component on the same page, beneath the list.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								选择其中之一，该应用就会把你带到此危机的编辑页面。
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								*危机详情*是当前页的子组件，就在列表的紧下方。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Alter the name of a crisis.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Notice that the corresponding name in the crisis list does _not_ change.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								修改危机的名称。
 								注意，危机列表中的相应名称**并没有**修改。
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								<div class="lightbox">
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								  <img src='generated/images/guide/router/crisis-center-detail.png' alt="Crisis Center Detail">
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								</div>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Unlike *Hero Detail*, which updates as you type,
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								*Crisis Detail* changes are temporary until you either save or discard them by pressing the "Save" or "Cancel" buttons.
 								Both buttons navigate back to the *Crisis Center* and its list of crises.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								这和*英雄详情*页略有不同。*英雄详情*会立即保存你所做的更改。
 								而*危机详情*页中，你的更改都是临时的 —— 除非按“保存”按钮保存它们，或者按“取消”按钮放弃它们。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								这两个按钮都会导航回*危机中心*，显示危机列表。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								***Do not click either button yet***.
 								Click the browser back button or the "Heroes" link instead.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								***先不要点击这些按钮***。
 								而是点击浏览器的后退按钮，或者点击“Heroes”链接。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Up pops a dialog box.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								这时会弹出一个对话框。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								<div class="lightbox">
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								  <img src='generated/images/guide/router/confirm-dialog.png' alt="Confirm Dialog">
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								</div>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You can say "OK" and lose your changes or click "Cancel" and continue editing.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你可以回答“确定”以放弃这些更改，或者回答“取消”来继续编辑。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Behind this behavior is the router's `CanDeactivate` guard.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The guard gives you a chance to clean-up or ask the user's permission before navigating away from the current view.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								这种行为的幕后是路由器的 `CanDeactivate` 守卫。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								该守卫让你有机会进行清理工作或在离开当前视图之前请求用户的许可。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `Admin` and `Login` buttons illustrate other router capabilities to be covered later in the guide.
 								This short introduction will do for now.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								`Admin` 和 `Login` 按钮用于演示路由器的其它能力，本章稍后的部分会讲解它们。这里只是个简短的讲解。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Proceed to the first application milestone.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								这就开始本应用的第一个里程碑。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): fix lots of broken links

Closes #16317

											
										
										
											2017-04-30 22:10:32 +02:00
+								{@a getting-started}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								## Milestone 1: Getting started
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								## 里程碑 1：起步
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Begin with a simple version of the app that navigates between two empty views.
-												docs(aio): ensure blank lines before HTML blocks in markdown

											
										
										
											2017-03-30 20:04:18 +01:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								开始本应用的一个简版，它在两个空路由之间导航。
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								<div class="lightbox">
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								  <img src='generated/images/guide/router/router-1-anim.gif' alt="App in action">
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								</div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
 								{@a import}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Generate a sample application to follow the walkthrough.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								遵循这些步骤生成一个范例应用。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng new angular-router-sample
 								</code-example>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								### Define Routes
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 翻译遗漏的内容

											
										
										
											2019-01-04 15:43:45 +08:00
+								### 定义路由
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								A router must be configured with a list of route definitions.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								路由器必须用“路由定义”的列表进行配置。
-												docs(aio): fix lots of broken links

Closes #16317

											
										
										
											2017-04-30 22:10:32 +02:00
+								Each definition translates to a [Route](api/router/Route) object which has two things: a
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								`path`, the URL path segment for this route; and a
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								`component`, the component associated with this route.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								每个定义都被翻译成了一个[Route](api/router/Route)对象。该对象有一个 `path` 字段，表示该路由中的 URL 路径部分，和一个 `component` 字段，表示与该路由相关联的组件。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The router draws upon its registry of definitions when the browser URL changes
 								or when application code tells the router to navigate along a route path.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								当浏览器的 URL 变化时或在代码中告诉路由器导航到一个路径时，路由器就会翻出它用来保存这些路由定义的注册表。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								In simpler terms, you might say this of the first route:
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								直白的说，你可以这样解释第一个路由：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
+								* When the browser's location URL changes to match the path segment `/crisis-center`, then
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								the router activates an instance of the `CrisisListComponent` and displays its view.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   当浏览器地址栏的 URL 变化时，如果它匹配上了路径部分 `/crisis-center`，路由器就会激活一个 `CrisisListComponent` 的实例，并显示它的视图。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
+								* When the application requests navigation to the path `/crisis-center`, the router
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								activates an instance of `CrisisListComponent`, displays its view, and updates the
 								browser's address location and history with the URL for that path.
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   **当应用程序请求导航到路径 `/crisis-center` 时，路由器激活一个 `CrisisListComponent` 的实例，显示它的视图，并将该路径更新到浏览器地址栏和历史。**
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								The first configuration defines an array of two routes with simple paths leading to the
 								`CrisisListComponent` and `HeroListComponent`. Generate the `CrisisList` and `HeroList` components.
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								第一个配置定义了由两个路由构成的数组，它们用简单的路径指向了 `CrisisListComponent` 和 `HeroListComponent`。来生成 `CrisisList` 和 `HeroList`。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng generate component crisis-list
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								</code-example>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng generate component hero-list
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								</code-example>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Replace the contents of each component with the sample HTML below.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 翻译遗漏的内容

											
										
										
											2019-01-04 15:43:45 +08:00
+								把每个组件的内容都替换成下列范例 HTML。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-tabs>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: ignore initial components for app compilation in router example (#28592)

PR Close #28592

											
										
										
											2019-02-07 16:57:18 +00:00
+								  <code-pane header="src/app/crisis-list/crisis-list.component.html" path="router/src/app/crisis-list/crisis-list.component.1.html">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: ignore initial components for app compilation in router example (#28592)

PR Close #28592

											
										
										
											2019-02-07 16:57:18 +00:00
+								  <code-pane header="src/app/hero-list/hero-list.component.html" path="router/src/app/hero-list/hero-list.component.1.html" region="template">
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								  </code-pane>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								</code-tabs>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								### Register Router and Routes
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 遗漏的翻译

											
										
										
											2018-12-20 09:56:09 +08:00
+								### 注册路由器与路由定义
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								In order to use the Router, you must first register the `RouterModule` from the `@angular/router` package. Define an array of routes, `appRoutes`, and pass them to the `RouterModule.forRoot()` method. It returns a module, containing the configured `Router` service provider, plus other providers that the routing library requires. Once the application is bootstrapped, the `Router` performs the initial navigation based on the current browser URL.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								要使用路由器，必须先注册来自 `@angular/router` 包中的 `RouterModule`。
 								定义一个路由数组 `appRoutes` 并把它传给 `RouterModule.forRoot()` 方法。
 								它会返回一个模块，其中包含配置好的 `Router` 服务提供商，以及路由库所需的其它提供商。
 								一旦启动了应用，`Router` 就会根据当前的浏览器 URL 进行首次导航。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								<div class="alert is-important">
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								  **Note:** The `RouterModule.forRoot` method is a pattern used to register application-wide providers. Read more about application-wide providers in the [Singleton services](guide/singleton-services#forRoot-router) guide.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								  **注意：** `RouterModule.forRoot` 方法是用于注册全应用级提供商的编码模式。要详细了解全应用级提供商，参见[单例服务](guide/singleton-services#forRoot-router) 一章。
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								</div>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.module.1.ts" header="src/app/app.module.ts (first-config)" region="first-config"></code-example>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/api-page-class.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/elements.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/frequent-ngmodules.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/language-service.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-api.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/releases.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing-observables.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/webpack.md
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/app/custom-elements/live-example/live-example.component.html
#	aio/src/app/custom-elements/live-example/live-example.component.ts
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/styles/main.scss
#	aio/tools/transforms/remark-package/services/renderMarkdown.js

											
										
										
											2018-07-27 10:51:18 +08:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								Adding the configured `RouterModule` to the `AppModule` is sufficient for simple route configurations.
 								As the application grows, you'll want to [refactor the routing configuration](#refactor-the-routing-configuration-into-a-routing-module) into a separate file
 								and create a **[Routing Module](#routing-module)**, a special type of `Service Module` dedicated to the purpose
 								of routing in feature modules.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								作为简单的路由配置，将添加配置好的 `RouterModule` 到 `AppModule` 中就足够了。
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								随着应用的成长，你将需要[将路由配置重构](#refactor-the-routing-configuration-into-a-routing-module)到单独的文件中，并创建**[路由模块](#routing-module)** - 一种特别的、专门为特性模块的路由器服务的**服务模块**。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								Registering the `RouterModule.forRoot()` in the `AppModule` imports makes the `Router` service available everywhere in the application.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								把 `RouterModule.forRoot()` 注册到 `AppModule` 的 `imports` 中，能让该 `Router` 服务在应用的任何地方都能使用。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								{@a shell}
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								### Add the Router Outlet
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								### 添加路由出口
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								The root `AppComponent` is the application shell. It has a title, a navigation bar with two links, and a router outlet where the router swaps components on and off the page. Here's what you get:
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								根组件 `AppComponent` 是本应用的壳。它在顶部有一个标题、一个带两个链接的导航条，在底部有一个*路由器出口*，路由器会在它所指定的位置上把组件切入或调出页面。就像下图中所标出的：
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								<div class="lightbox">
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								  <img src='generated/images/guide/router/shell-and-outlet.png' alt="Shell">
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								</div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								The router outlet serves as a placeholder when the routed components will be rendered below it.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								路由出口扮演一个占位符的角色，路由组件将会渲染在它的下方。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								{@a shell-template}
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								The corresponding component template looks like this:
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								该组件所对应的模板是这样的：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.component.1.html" header="src/app/app.component.html"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a wildcard}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								### Define a Wildcard route
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								### 定义通配符路由
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								You've created two routes in the app so far, one to `/crisis-center` and the other to `/heroes`. Any other URL causes the router to throw an error and crash the app.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你以前在应用中创建过两个路由，一个是 `/crisis-center`，另一个是 `/heroes`。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								所有其它 URL 都会导致路由器抛出错误，并让应用崩溃。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Add a **wildcard** route to intercept invalid URLs and handle them gracefully.
 								A _wildcard_ route has a path consisting of two asterisks. It matches _every_ URL.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The router will select _this_ route if it can't match a route earlier in the configuration.
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								A wildcard route can navigate to a custom "404 Not Found" component or [redirect](#redirect) to an existing route.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								可以添加一个**通配符**路由来拦截所有无效的 URL，并优雅的处理它们。
 								*通配符*路由的 `path` 是两个星号（`**`），它会匹配*任何* URL。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								当路由器匹配不上以前定义的那些路由时，它就会选择*这个*路由。
 								通配符路由可以导航到自定义的“404 Not Found”组件，也可以[重定向](guide/router#redirect)到一个现有路由。
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								The router selects the route with a [_first match wins_](#example-config) strategy.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Wildcard routes are the least specific routes in the route configuration.
 								Be sure it is the _last_ route in the configuration.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								路由器使用[先匹配者优先](guide/router#example-config)的策略来选择路由。
 								通配符路由是路由配置中最没有特定性的那个，因此务必确保它是配置中的*最后一个*路由。
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								To test this feature, add a button with a `RouterLink` to the `HeroListComponent` template and set the link to `"/sidekicks"`.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								要测试本特性，请往 `HeroListComponent` 的模板中添加一个带 `RouterLink` 的按钮，并且把它的链接设置为 `"/sidekicks"`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/hero-list/hero-list.component.1.html" header="src/app/hero-list/hero-list.component.html (excerpt)"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								The application will fail if the user clicks that button because you haven't defined a `"/sidekicks"` route yet.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								当用户点击该按钮时，应用就会失败，因为你尚未定义过 `"/sidekicks"` 路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								Instead of adding the `"/sidekicks"` route, define a `wildcard` route instead and have it navigate to a simple `PageNotFoundComponent`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								不要添加 `"/sidekicks"` 路由，而是定义一个“通配符”路由，让它直接导航到 `PageNotFoundComponent` 组件。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.module.1.ts" header="src/app/app.module.ts (wildcard)" region="wildcard"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								Create the `PageNotFoundComponent` to display when users visit invalid URLs.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								创建 `PageNotFoundComponent`，以便在用户访问无效网址时显示它。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng generate component page-not-found
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								</code-example>
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/page-not-found/page-not-found.component.html" header="src/app/page-not-found.component.html (404 component)"></code-example>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Now when the user visits `/sidekicks`, or any other invalid URL, the browser displays "Page not found".
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The browser address bar continues to point to the invalid URL.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								现在，当用户访问 `/sidekicks` 或任何无效的 URL 时，浏览器就会显示“Page not found”。
 								浏览器的地址栏仍指向无效的 URL。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								{@a redirect}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								### Set up redirects
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								### 设置跳转
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								When the application launches, the initial URL in the browser bar is something like:
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								应用启动时，浏览器地址栏中的初始 URL 是这样的：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								<code-example>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								  localhost:4200
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								</code-example>
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								That doesn't match any of the concrete configured routes which means
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								the router falls through to the wildcard route and displays the `PageNotFoundComponent`.
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								它不能匹配上任何具体的路由，于是就会走到通配符路由中去，并且显示 `PageNotFoundComponent`。
-												fix: 增补翻译

											
										
										
											2017-10-22 11:19:24 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								The application needs a **default route** to a valid page.
 								The default page for this app is the list of heroes.
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								The app should navigate there as if the user clicked the "Heroes" link or pasted `localhost:4200/heroes` into the address bar.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								这个应用需要一个有效的**默认路由**，在这里应该用英雄列表作为默认页。当用户点击"Heroes"链接或把 `localhost:4200/heroes` 粘贴到地址栏时，它应该导航到列表页。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The preferred solution is to add a `redirect` route that translates the initial relative URL (`''`)
 								to the desired default path (`/heroes`). The browser address bar shows `.../heroes` as if you'd navigated there directly.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								首选方案是添加一个 `redirect` 路由来把最初的相对路径（`''`）转换成期望的默认路径（`/heroes`）。
 								浏览器地址栏会显示 `.../heroes`，就像你直接导航到那里一样。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Add the default route somewhere _above_ the wildcard route.
 								It's just above the wildcard route in the following excerpt showing the complete `appRoutes` for this milestone.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								在通配符路由*上方*添加一个默认路由。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								在下方的代码片段中，它出现在通配符路由的紧上方，展示了这个里程碑的完整 `appRoutes`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app-routing.module.1.ts" header="src/app/app-routing.module.ts (appRoutes)" region="appRoutes"></code-example>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								A redirect route requires a `pathMatch` property to tell the router how to match a URL to the path of a route.
 								The router throws an error if you don't.
 								In this app, the router should select the route to the `HeroListComponent` only when the *entire URL* matches `''`,
 								so set the `pathMatch` value to `'full'`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								重定向路由需要一个 `pathMatch` 属性，来告诉路由器如何用 URL 去匹配路由的路径，否则路由器就会报错。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在本应用中，路由器应该只有在*完整的 URL*等于 `''` 时才选择 `HeroListComponent` 组件，因此要把 `pathMatch` 设置为 `'full'`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Technically, `pathMatch = 'full'` results in a route hit when the *remaining*, unmatched segments of the URL match `''`.
 								In this example, the redirect is in a top level route so the *remaining* URL and the *entire* URL are the same thing.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								从技术角度说，`pathMatch = 'full'` 导致 URL 中*剩下的*、未匹配的部分必须等于 `''`。
 								在这个例子中，跳转路由在一个顶级路由中，因此*剩下的*URL 和*完整的*URL 是一样的。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The other possible `pathMatch` value is `'prefix'` which tells the router
 								to match the redirect route when the *remaining* URL ***begins*** with the redirect route's _prefix_ path.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`pathMatch` 的另一个可能的值是 `'prefix'`，它会告诉路由器：当*剩下的*URL 以这个跳转路由中的 `prefix` 值开头时，就会匹配上这个跳转路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Don't do that here.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								If the `pathMatch` value were `'prefix'`, _every_ URL would match `''`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								在这里不能这么做！如果 `pathMatch` 的值是 `'prefix'`，那么*每个*URL 都会匹配上 `''`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Try setting it to `'prefix'` then click the `Go to sidekicks` button.
 								Remember that's a bad URL and you should see the "Page not found" page.
 								Instead, you're still on the "Heroes" page.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Enter a bad URL in the browser address bar.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You're instantly re-routed to `/heroes`.
 								_Every_ URL, good or bad, that falls through to _this_ route definition
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								will be a match.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								尝试把它设置为 `'prefix'`，然后点击 `Go to sidekicks` 按钮。别忘了，它是一个无效 URL，本应显示“Page not found”页。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								但是，你仍然在“英雄列表”页中。在地址栏中输入一个无效的 URL，你又被路由到了 `/heroes`。
 								*每一个* URL，无论有效与否，都会匹配上这个路由定义。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The default route should redirect to the `HeroListComponent` _only_ when the _entire_ url is  `''`.
 								Remember to restore the redirect to `pathMatch = 'full'`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								默认路由应该只有在*整个*URL 等于 `''` 时才重定向到 `HeroListComponent`，别忘了把重定向路由设置为 `pathMatch = 'full'`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Learn more in Victor Savkin's
-												docs: update link to post on redirects in router guide (#27256)

Change victor savkin's url post on redirects to:
http://vsavkin.tumblr.com/post/146722301646/angular-router-empty-paths-componentless-routes

PR Close #27256

											
										
										
											2018-11-24 14:56:06 +01:00
+								[post on redirects](http://vsavkin.tumblr.com/post/146722301646/angular-router-empty-paths-componentless-routes).
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								要了解更多，参见 Victor Savkin 的帖子[关于重定向](http://victorsavkin.com/post/146722301646/angular-router-empty-paths-componentless-routes)。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								### Basics wrap up
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### “起步阶段”总结
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								You've got a very basic navigating app, one that can switch between two views
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								when the user clicks a link.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你得到了一个非常基本的、带导航的应用，当用户点击链接时，它能在两个视图之间切换。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								You've learned how to do the following:
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你学到了如何：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Load the router library.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   加载路由库
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Add a nav bar to the shell template with anchor tags, `routerLink`  and `routerLinkActive` directives.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   往壳组件的模板中添加一个导航条，导航条中有一些 A 标签、`routerLink` 指令和 `routerLinkActive` 指令
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Add a `router-outlet` to the shell template where views will be displayed.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   往壳组件的模板中添加一个 `router-outlet` 指令，视图将会被显示在那里
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								* Configure the router module with `RouterModule.forRoot()`.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								   用 `RouterModule.forRoot()` 配置路由器模块
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Set the router to compose HTML5 browser URLs.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix:错别字及语法

											
										
										
											2018-08-23 21:51:48 +08:00
+								   设置路由器，使其合成 HTML5 模式的浏览器 URL
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* handle invalid routes with a `wildcard` route.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   使用通配符路由来处理无效路由
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* navigate to the default route when the app launches with an empty path.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   当应用在空路径下启动时，导航到默认路由
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The starter app's structure looks like this:
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								这个初学者应用的结构是这样的：
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								<div class='filetree'>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								  <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								    angular-router-sample
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								  </div>
 								  <div class='children'>
 								    <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								      src
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
 								    <div class='children'>
 								      <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								        app
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      </div>
 								      <div class='children'>
 								        <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								          crisis-list
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								        <div class='children'>
 								          <div class='file'>
 								            crisis-list.component.css
 								          </div>
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								          crisis-list.component.html
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								          crisis-list.component.ts
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								          hero-list
 								        </div>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								        <div class='children'>
 								          <div class='file'>
 								            hero-list.component.css
 								          </div>
 								          <div class='file'>
 								            hero-list.component.html
 								          </div>
 								          <div class='file'>
 								            hero-list.component.ts
 								          </div>
-												fix: 移除纯粹由空格组成的行，它会导致错误的 markdown 编译

											
										
										
											2019-01-01 22:17:43 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        <div class='file'>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								          page-not-found
 								        </div>
 								        <div class='children'>
 								          <div class='file'>
 								            page-not-found.component.css
 								          </div>
 								          <div class='file'>
 								            page-not-found.component.html
 								          </div>
 								          <div class='file'>
 								            page-not-found.component.ts
 								          </div>
-												fix: 移除纯粹由空格组成的行，它会导致错误的 markdown 编译

											
										
										
											2019-01-01 22:17:43 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        <div class='file'>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								          app.component.css
 								        </div>
 								        <div class='file'>
 								          app.component.html
 								        </div>
 								        <div class='file'>
 								          app.component.ts
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        </div>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								          app.module.ts
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								        main.ts
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								        index.html
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								        styles.css
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								        tsconfig.json
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								      node_modules ...
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								      package.json
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								  </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								</div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Here are the files discussed in this milestone.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								下面是当前里程碑中讨论过的文件列表：
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								<code-tabs>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="app.component.html" path="router/src/app/app.component.1.html">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="app.module.ts" path="router/src/app/app.module.1.ts">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: ignore initial components for app compilation in router example (#28592)

PR Close #28592

											
										
										
											2019-02-07 16:57:18 +00:00
+								  <code-pane header="hero-list/hero-list.component.html" path="router/src/app/hero-list/hero-list.component.1.html">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: ignore initial components for app compilation in router example (#28592)

PR Close #28592

											
										
										
											2019-02-07 16:57:18 +00:00
+								  <code-pane header="crisis-list/crisis-list.component.html" path="router/src/app/crisis-list/crisis-list.component.1.html">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="page-not-found/page-not-found.component.html" path="router/src/app/page-not-found/page-not-found.component.html">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="index.html" path="router/src/index.html">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								  </code-pane>
 								</code-tabs>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): fix lots of broken links

Closes #16317

											
										
										
											2017-04-30 22:10:32 +02:00
+								{@a routing-module}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								## Milestone 2: *Routing module*
-												fix:修复路由与导航章节的目录序号及格式
											
										
										
											2018-12-17 18:26:55 +08:00
+								## 里程碑 2：**路由模块**
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								In the initial route configuration, you provided a simple setup with two routes used
 								to configure the application for routing. This is perfectly fine for simple routing.
 								As the application grows and you make use of more `Router` features, such as guards,
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								resolvers, and child routing, you'll naturally want to refactor the routing configuration into its own file.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								We recommend moving the routing information into a special-purpose module called a *Routing Module*.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在原始的路由配置中，你提供了仅有两个路由的简单配置来设置应用的路由。对于简单的路由，这没有问题。
 								  随着应用的成长，你用到了更多**路由器**特性，比如守卫、解析器和子路由等，你会很自然地想要重构路由。
 								  我们建议将路由信息移到一个单独的特殊用途的模块，叫做**路由模块**。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								The **Routing Module** has several characteristics:
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								**路由模块**有一系列特性：
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Separates routing concerns from other application concerns.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正了死链接

											
										
										
											2018-03-07 16:48:44 +08:00
+								   把路由这个关注点从其它应用类关注点中分离出去。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Provides a module to replace or remove when testing the application.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正了死链接

											
										
										
											2018-03-07 16:48:44 +08:00
+								   测试特性模块时，可以替换或移除路由模块。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Provides a well-known location for routing service providers including guards and resolvers.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正了死链接

											
										
										
											2018-03-07 16:48:44 +08:00
+								   为路由服务提供商（包括守卫和解析器等）提供一个共同的地方。
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								* Does **not** declare components.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正了死链接

											
										
										
											2018-03-07 16:48:44 +08:00
+								   **不要**声明组件。
-												fix: 移除纯粹由空格组成的行，它会导致错误的 markdown 编译

											
										
										
											2019-01-01 22:17:43 +08:00
-												docs: add section on router integration (#20023)

PR Close #20023

											
										
										
											2018-09-12 11:20:07 -05:00
+								{@a integrate-routing}
 								### Integrate routing with your app
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								### 把路由集成到应用中
-												docs: add section on router integration (#20023)

PR Close #20023

											
										
										
											2018-09-12 11:20:07 -05:00
+								The sample routing application does not include routing by default.
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								When you use the [Angular CLI](cli) to create a project that will use routing, set the `--routing` option for the project or app, and for each NgModule.
-												docs: remove redundant whitespaces and fix minor typos (#33422)

PR Close #33422

											
										
										
											2019-10-26 21:35:03 +07:00
+								When you create or initialize a new project (using the CLI [`ng new`](cli/new) command) or a new app (using the [`ng generate app`](cli/generate) command), specify the `--routing` option. This tells the CLI to include the `@angular/router` npm package and create a file named `app-routing.module.ts`.
-												docs: add section on router integration (#20023)

PR Close #20023

											
										
										
											2018-09-12 11:20:07 -05:00
+								You can then use routing in any NgModule that you add to the project or app.
-												docs: update routing integration section based on feedback (#20023)

PR Close #20023

											
										
										
											2018-09-12 13:06:02 -05:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								路由应用范例中默认不包含路由。
 								要想在使用 [Angular CLI](cli) 创建项目时支持路由，请为项目或应用的每个 NgModule 设置 `--routing` 选项。
 								当你用 CLI 命令 [`ng new`](cli/new) 创建新项目或用 [`ng generate app`](cli/generate) 命令创建新应用，请指定 `--routing` 选项。这会告诉 CLI 包含上 `@angular/router` 包，并创建一个名叫 `app-routing.module.ts` 的文件。
 								然后你就可以在添加到项目或应用中的任何 NgModule 中使用路由功能了。
-												docs: update routing integration section based on feedback (#20023)

PR Close #20023

											
										
										
											2018-09-12 13:06:02 -05:00
+								For example, the following command generates an NgModule that can use routing.
-												docs: add section on router integration (#20023)

PR Close #20023

											
										
										
											2018-09-12 11:20:07 -05:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								比如，可以用下列命令生成带路由的 NgModule。
-												docs: add section on router integration (#20023)

PR Close #20023

											
										
										
											2018-09-12 11:20:07 -05:00
+								```sh
 								ng generate module my-module --routing
 								```
 								This creates a separate file named `my-module-routing.module.ts` to store the NgModule's routes.
 								The file includes an empty `Routes` object that you can fill with routes to different components and NgModules.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								这将创建一个名叫 `my-module-routing.module.ts` 的独立文件，来保存这个 NgModule 的路由信息。
 								该文件包含一个空的 `Routes` 对象，你可以使用一些指向各个组件和 NgModule 的路由来填充该对象。
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a routing-refactor}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								### Refactor the routing configuration into a _routing module_
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 将路由配置重构为*路由模块*
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Create an `AppRouting` module in the `/app` folder to contain the routing configuration.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								在 `/app` 目录下创建一个 `AppRouting` 模块，以包含路由配置。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng generate module app-routing --module app --flat
 								</code-example>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: fix typo PageNotFoundCompponent (#27799)
closes: #27795

PR Close #27799

											
										
										
											2018-12-21 14:56:31 +01:00
+								Import the `CrisisListComponent`, `HeroListComponent`, and `PageNotFoundComponent` symbols
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								just like you did in the `app.module.ts`. Then move the `Router` imports
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								and routing configuration, including `RouterModule.forRoot()`, into this routing module.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								导入 `CrisisListComponent`、`HeroListComponent` 和 `PageNotFoundCompponent` 组件，就像 `app.module.ts` 中那样。然后把 `Router` 的导入语句和路由配置以及 `RouterModule.forRoot()` 移入这个路由模块中。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Re-export the Angular `RouterModule` by adding it to the module `exports` array.
 								By re-exporting the `RouterModule` here the components declared in `AppModule` will have access to router directives such as `RouterLink` and `RouterOutlet`.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 精修翻译

											
										
										
											2019-01-27 22:56:04 +08:00
+								把 Angular 的 `RouterModule`添加到该模块的 `exports` 数组中，以便再次导出它 。
 								通过再次导出 `RouterModule`，当在 `AppModule` 中导入了 `AppRoutingModule` 之后，那些声明在 `AppModule` 中的组件就可以访问路由指令了，比如 `RouterLink` 和 `RouterOutlet`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								After these steps, the file should look like this.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								做完这些之后，该文件变成了这样：
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app-routing.module.1.ts" header="src/app/app-routing.module.ts"></code-example>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: update examples region to match the description in the guide (#29259)

PR Close #29259

											
										
										
											2019-03-12 11:33:48 -07:00
+								Next, update the `app.module.ts` file, removing `RouterModule.forRoot` in
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								the `imports` array.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								接下来，修改 `app.module.ts` 文件，从 `imports` 数组中移除 `RouterModule.forRoot`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	.nvmrc
#	aio/content/cli/index.md
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/app-shell.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bazel.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/build.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/cli-builder.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/complex-animation-sequences.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/creating-libraries.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-navtree.md
#	aio/content/guide/dependency-injection-providers.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/deprecations.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/dynamic-form.md
#	aio/content/guide/elements.md
#	aio/content/guide/entry-components.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/file-structure.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms-overview.md
#	aio/content/guide/forms.md
#	aio/content/guide/frequent-ngmodules.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/ivy.md
#	aio/content/guide/language-service.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/module-types.md
#	aio/content/guide/ngmodule-api.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/providers.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/releases.md
#	aio/content/guide/reusable-animations.md
#	aio/content/guide/route-animations.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/schematics-authoring.md
#	aio/content/guide/schematics-for-libraries.md
#	aio/content/guide/schematics.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-devops.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-local.md
#	aio/content/guide/sharing-ngmodules.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/static-query-migration.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/transition-and-triggers.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade-setup.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/using-libraries.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/web-worker.md
#	aio/content/guide/workspace-config.md
#	aio/content/marketing/events.html
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/content/start/data.md
#	aio/content/start/deployment.md
#	aio/content/start/forms.md
#	aio/content/start/index.md
#	aio/content/start/routing.md
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/app/app.component.spec.ts
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/app/layout/mode-banner/mode-banner.component.ts
#	aio/src/app/layout/nav-item/nav-item.component.html
#	aio/src/app/shared/toc.service.ts
#	aio/src/styles/0-base/_typography.scss
#	aio/src/styles/2-modules/_api-pages.scss
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/yarn.lock
#	packages/common/http/src/headers.ts
#	packages/common/http/src/interceptor.ts
#	packages/common/http/src/params.ts
#	packages/common/http/src/response.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/date_pipe.ts
#	packages/core/src/change_detection/pipe_transform.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/directives.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render3/component_ref.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/form_builder.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/directives/router_outlet.ts
#	packages/router/src/events.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts
#	packages/router/src/shared.ts

											
										
										
											2020-01-11 18:10:12 +08:00
+								<code-example path="router/src/app/app.module.2.ts" header="src/app/app.module.ts"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Later in this guide you will create [multiple routing modules](#heroes-functionality) and discover that
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								you must import those routing modules [in the correct order](#routing-module-order).
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								本章稍后的部分，你将创建一个[多路由模块](#heroes-functionality)，并揭示你为何必须[以正确的顺序导入那些路由模块](#routing-module-order)。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The application continues to work just the same, and you can use `AppRoutingModule` as
 								the central place to maintain future routing configuration.
-												fix: 精修翻译

											
										
										
											2019-02-02 02:29:31 +08:00
+								应用继续照常运行，你可以把路由模块作为将来每个模块维护路由配置的中心位置。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a why-routing-module}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								### Do you need a _Routing Module_?
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 你需要**路由模块**吗？
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The _Routing Module_ *replaces* the routing configuration in the root or feature module.
 								_Either_ configure routes in the Routing Module _or_ within the module itself but not in both.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								**路由模块**在根模块或者特性模块替换了路由配置。在路由模块或者在模块内部配置路由，但不要同时在两处都配置。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The Routing Module is a design choice whose value is most obvious when the configuration is complex
 								and includes specialized guard and resolver services.
 								It can seem like overkill when the actual configuration is dead simple.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								路由模块是设计选择，它的价值在配置很复杂，并包含专门守卫和解析器服务时尤其明显。
 								在配置很简单时，它可能看起来很多余。
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Some developers skip the Routing Module (for example, `AppRoutingModule`) when the configuration is simple and
 								merge the routing configuration directly into the companion module (for example, `AppModule`).
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								在配置很简单时，一些开发者跳过路由模块（例如 `AppRoutingModule`），并将路由配置直接混合在关联模块中（比如 `AppModule` ）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Choose one pattern or the other and follow that pattern consistently.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								从中选择一种模式，并坚持模式的一致性。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Most developers should always implement a Routing Module for the sake of consistency.
 								It keeps the code clean when configuration becomes complex.
 								It makes testing the feature module easier.
 								Its existence calls attention to the fact that a module is routed.
 								It is where developers expect to find and expand routing configuration.
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								大多数开发者都应该采用路由模块，以保持一致性。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								它在配置复杂时，能确保代码干净。
 								它让测试特性模块更加容易。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								它的存在让人一眼就能看出这个模块是带路由的。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								开发者可以很自然的从路由模块中查找和扩展路由配置。
-												docs(aio): fix lots of broken links

Closes #16317

											
										
										
											2017-04-30 22:10:32 +02:00
+								{@a heroes-feature}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								## Milestone 3: Heroes feature
-												fix:修复路由与导航章节的目录序号及格式
											
										
										
											2018-12-17 18:26:55 +08:00
+								## 里程碑 3: 英雄特征区
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								You've seen how to navigate using the `RouterLink` directive.
 								Now you'll learn the following:
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你刚刚学习了如何用 `RouterLink` 指令进行导航。接下来要：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Organize the app and routes into *feature areas* using modules.
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
 								   用模块把应用和路由组织为一些*特性区*
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Navigate imperatively from one component to another.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   命令式的从一个组件导航到另一个
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Pass required and optional information in route parameters.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   通过路由传递必要信息和可选信息
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								This example recreates the heroes feature in the "Services" episode of the
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
+								[Tour of Heroes tutorial](tutorial/toh-pt4 "Tour of Heroes: Services"),
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								and you'll be copying much of the code
-												docs(aio): rename cb- files and a few others

											
										
										
											2017-04-21 17:21:45 -07:00
+								from the <live-example name="toh-pt4" title="Tour of Heroes: Services example code"></live-example>.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								这个例子重写了[《英雄指南》](tutorial/toh-pt4 "Tour of Heroes: Services")的“服务”部分的英雄列表特性，你可以从<live-example name="toh-pt4" title="英雄指南：各个服务的范例代码"></live-example>中复制大部分代码过来。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Here's how the user will experience this version of the app:
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								下面是用户将看到的版本：
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								<div class="lightbox">
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								  <img src='generated/images/guide/router/router-2-anim.gif' alt="App in action">
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								</div>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								A typical application has multiple *feature areas*,
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								each dedicated to a particular business purpose.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								典型的应用具有多个*特性区*，每个特性区都专注于特定的业务用途。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								While you could continue to add files to the `src/app/` folder,
 								that is unrealistic and ultimately not maintainable.
 								Most developers prefer to put each feature area in its own folder.
-												fix: 把遗漏的 我们 替换成 你

											
										
										
											2018-03-23 09:43:02 +08:00
+								虽然你也可以把文件都放在 `src/app/` 目录下，但那样是不现实的，而且很难维护。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								大部分开发人员更喜欢把每个特性区都放在它自己的目录下。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You are about to break up the app into different *feature modules*, each with its own concerns.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Then you'll import into the main module and navigate among them.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你准备把应用拆分成多个不同的*特性模块*，每个特有模块都有自己的关注点。
 								然后，你就会把它们导入到主模块中，并且在它们之间导航。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a heroes-functionality}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								### Add heroes functionality
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 添加英雄管理功能
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Follow these steps:
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								遵循下列步骤：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								* Create a `HeroesModule` with routing in the heroes folder and register it with the root `AppModule`. This is where you'll be implementing the *hero management*.
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								  在 `heroes` 目录下创建一个带路由的 `HeroesModule`，并把它注册进 `AppModule` 中。
 								  这里就是你实现*英雄管理*特性的地方。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng generate module heroes/heroes --module app --flat --routing
 								</code-example>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								* Move the placeholder `hero-list` folder that's in the `app` into the `heroes` folder.
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								  把 `app` 下占位用的 `hero-list` 移到 `heroes` 目录中。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								* Copy the contents of the `heroes/heroes.component.html` from
 								  the <live-example name="toh-pt4" title="Tour of Heroes: Services example code">"Services" tutorial</live-example> into the `hero-list.component.html` template.
-												fix: 移除纯粹由空格组成的行，它会导致错误的 markdown 编译

											
										
										
											2019-01-01 22:17:43 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								  从 <live-example name="toh-pt4" title="Tour of Heroes: Services example code">教程的 "服务" 部分</live-example>把 `heroes/heroes.component.html` 的内容复制到 `hero-list.component.html` 模板中。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
+								  * Relabel the `<h2>` to `<h2>HEROES</h2>`.
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								     给 `<h2>` 加文字，改成 `<h2>HEROES</h2>`。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								  * Delete the `<app-hero-detail>` component at the bottom of the template.
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								     删除模板底部的 `<app-hero-detail>` 组件。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								* Copy the contents of the `heroes/heroes.component.css` from the live example into the `hero-list.component.css` file.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
 								  把在线例子中 `heroes/heroes.component.css` 文件的内容复制到 `hero-list.component.css` 文件中。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								* Copy the contents of the `heroes/heroes.component.ts` from the live example into the `hero-list.component.ts` file.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								  把在线例子中 `heroes/heroes.component.ts` 文件的内容复制到 `hero-list.component.ts` 文件中。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								  * Change the component class name to `HeroListComponent`.
-												fix: 移除纯粹由空格组成的行，它会导致错误的 markdown 编译

											
										
										
											2019-01-01 22:17:43 +08:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								    把组件类名改为 `HeroListComponent`。
-												fix: 移除纯粹由空格组成的行，它会导致错误的 markdown 编译

											
										
										
											2019-01-01 22:17:43 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								  * Change the `selector` to `app-hero-list`.
-												fix: 移除纯粹由空格组成的行，它会导致错误的 markdown 编译

											
										
										
											2019-01-01 22:17:43 +08:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								    把 `selector` 改为 `app-hero-list`。
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<div class="alert is-helpful">
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								   Selectors are **not required** for _routed components_ due to the components are dynamically inserted when the page is rendered, but are useful for identifying and targeting them in your HTML element tree.
-												fix: 移除纯粹由空格组成的行，它会导致错误的 markdown 编译

											
										
										
											2019-01-01 22:17:43 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								   对于**路由组件**来说，这些选择器**不是必须的**，因为这些组件是在渲染页面时动态插入的，不过选择器对于在 HTML 元素树中标记和选中它们是很有用的。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
 								</div>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								* Copy the `hero-detail` folder, the `hero.ts`, `hero.service.ts`,  and `mock-heroes.ts` files into the `heroes` subfolder.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
 								  把 `hero-detail` 目录中的 `hero.ts`、`hero.service.ts` 和 `mock-heroes.ts` 文件复制到 `heroes` 子目录下。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								* Copy the `message.service.ts` into the `src/app` folder.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
 								  把 `message.service.ts` 文件复制到 `src/app` 目录下。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								* Update the relative path import to the `message.service` in the `hero.service.ts` file.
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								  在 `hero.service.ts` 文件中修改导入 `message.service` 的相对路径。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Next, you'll update the `HeroesModule` metadata.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								接下来，还要修改 `HeroesModule` 的元数据。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								  * Import and add the `HeroDetailComponent` and `HeroListComponent` to the `declarations` array in the `HeroesModule`.
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								    导入 `HeroDetailComponent` 和 `HeroListComponent`，并添加到 `HeroesModule` 模块的 `declarations` 数组中。
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	.nvmrc
#	aio/content/cli/index.md
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/app-shell.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bazel.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/build.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/cli-builder.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/complex-animation-sequences.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/creating-libraries.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-navtree.md
#	aio/content/guide/dependency-injection-providers.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/deprecations.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/dynamic-form.md
#	aio/content/guide/elements.md
#	aio/content/guide/entry-components.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/file-structure.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms-overview.md
#	aio/content/guide/forms.md
#	aio/content/guide/frequent-ngmodules.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/ivy.md
#	aio/content/guide/language-service.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/module-types.md
#	aio/content/guide/ngmodule-api.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/providers.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/releases.md
#	aio/content/guide/reusable-animations.md
#	aio/content/guide/route-animations.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/schematics-authoring.md
#	aio/content/guide/schematics-for-libraries.md
#	aio/content/guide/schematics.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-devops.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-local.md
#	aio/content/guide/sharing-ngmodules.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/static-query-migration.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/transition-and-triggers.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade-setup.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/using-libraries.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/web-worker.md
#	aio/content/guide/workspace-config.md
#	aio/content/marketing/events.html
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/content/start/data.md
#	aio/content/start/deployment.md
#	aio/content/start/forms.md
#	aio/content/start/index.md
#	aio/content/start/routing.md
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/app/app.component.spec.ts
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/app/layout/mode-banner/mode-banner.component.ts
#	aio/src/app/layout/nav-item/nav-item.component.html
#	aio/src/app/shared/toc.service.ts
#	aio/src/styles/0-base/_typography.scss
#	aio/src/styles/2-modules/_api-pages.scss
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/yarn.lock
#	packages/common/http/src/headers.ts
#	packages/common/http/src/interceptor.ts
#	packages/common/http/src/params.ts
#	packages/common/http/src/response.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/date_pipe.ts
#	packages/core/src/change_detection/pipe_transform.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/directives.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render3/component_ref.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/form_builder.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/directives/router_outlet.ts
#	packages/router/src/events.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts
#	packages/router/src/shared.ts

											
										
										
											2020-01-11 18:10:12 +08:00
+								<code-example path="router/src/app/heroes/heroes.module.ts" header="src/app/heroes/heroes.module.ts"></code-example>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
 								When you're done, you'll have these *hero management* files:
-												fix: typo

											
										
										
											2018-10-09 17:16:53 +08:00
+								做完这些，你就有了四个*英雄管理*特性区的文件：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								<div class='filetree'>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								  <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    src/app/heroes
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								  </div>
 								  <div class='children'>
 								    <div class='file'>
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								      hero-detail
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      <div class='children'>
 								        <div class='file'>
 								          hero-detail.component.css
 								        </div>
 								        <div class='file'>
 								          hero-detail.component.html
 								        </div>
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								        <div class='file'>
 								          hero-detail.component.ts
 								        </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      </div>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    <div class='file'>
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								      hero-list
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      <div class='children'>
 								        <div class='file'>
 								          hero-list.component.css
 								        </div>
 								        <div class='file'>
 								          hero-list.component.html
 								        </div>
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								        <div class='file'>
 								          hero-list.component.ts
 								        </div></div>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								      hero.service.ts
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								    </div>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
 								    <div class='file'>
 								      hero.ts
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								    <div class='file'>
 								      heroes-routing.module.ts
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								    </div>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								      heroes.module.ts
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								    <div class='file'>
 								      mock-heroes.ts
 								    </div>
 								    </div>
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								  </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								</div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a hero-routing-requirements}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								#### *Hero* feature routing requirements
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								#### *英雄*特性区的路由需求
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The heroes feature has two interacting components, the hero list and the hero detail.
 								The list view is self-sufficient; you navigate to it, it gets a list of heroes and displays them.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								“英雄”特性有两个相互协作的组件，列表和详情。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								列表视图是自给自足的，你导航到它，它会自行获取英雄列表并显示他们。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The detail view is different. It displays a particular hero. It can't know which hero to show on its own.
 								That information must come from outside.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								详情视图就不同了。它要显示一个特定的英雄，但是它本身却无法知道显示哪一个，此信息必须来自外部。
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								When the user selects a hero from the list, the app should navigate to the detail view
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								and show that hero.
 								You tell the detail view which hero to display by including the selected hero's id in the route URL.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								当用户从列表中选择了一个英雄时，应用就导航到详情页以显示那个英雄。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								  通过把所选英雄的 id 编码进路由的 URL 中，就能告诉详情视图该显示哪个英雄。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Import the hero components from their new locations in the `src/app/heroes/` folder, define the two hero routes.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								从新位置 `src/app/heroes/` 目录中导入英雄相关的组件，定义两个“英雄管理”路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Now that you have routes for the `Heroes` module, register them with the `Router` via the
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								`RouterModule` _almost_ as you did in the `AppRoutingModule`.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								现在，你有了 `Heroes` 模块的路由，还得在 `RouterModule` 中把它们注册给*路由器*，和 `AppRoutingModule` 中的做法几乎完全一样。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								There is a small but critical difference.
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								In the `AppRoutingModule`, you used the static **`RouterModule.forRoot()`** method to register the routes and application level service providers.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								In a feature module you use the static **`forChild`** method.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								这里有少量但是关键的不同点。
-												fix: 把遗漏的 我们 替换成 你

											
										
										
											2018-03-23 09:43:02 +08:00
+								在 `AppRoutingModule` 中，你使用了静态的 `RouterModule.`**`forRoot`**方法来注册路由和全应用级服务提供商。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在特性模块中，你要改用**`forChild`**静态方法。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								Only call `RouterModule.forRoot()` in the root `AppRoutingModule`
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								(or the `AppModule` if that's where you register top level application routes).
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								In any other module, you must call the **`RouterModule.forChild`** method to register additional routes.
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								只在根模块 `AppRoutingModule` 中调用 `RouterModule.forRoot()`（如果在 `AppModule` 中注册应用的顶级路由，那就在 `AppModule` 中调用）。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在其它模块中，你就必须调用**`RouterModule.forChild`**方法来注册附属路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								The updated `HeroesRoutingModule` looks like this:
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								修改后的 `HeroesRoutingModule` 是这样的：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/heroes-routing.module.1.ts" header="src/app/heroes/heroes-routing.module.ts"></code-example>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<div class="alert is-helpful">
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Consider giving each feature module its own route configuration file.
 								It may seem like overkill early when the feature routes are simple.
 								But routes have a tendency to grow more complex and consistency in patterns pays off over time.
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								考虑让每个特性模块都有自己的路由配置文件。
 								在特性路由非常简单的早期阶段它看起来可能有点过度设计，但是，路由很容易变得更复杂，随着时间的推移，保持一致的模式会让你得到回报。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								</div>
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a remove-duplicate-hero-routes}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								#### Remove duplicate hero routes
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								#### 移除重复的“英雄管理”路由
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The hero routes are currently defined in _two_ places: in the `HeroesRoutingModule`,
 								by way of the `HeroesModule`, and in the `AppRoutingModule`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								英雄类的路由目前定义在两个地方：`HeroesRoutingModule` 中（并最终给 `HeroesModule`）和 `AppRoutingModule` 中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Routes provided by feature modules are combined together into their imported module's routes by the router.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								This allows you to continue defining the feature module routes without modifying the main route configuration.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								由特性模块提供的路由会被路由器再组合上它们所导入的模块的路由。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								这让你可以继续定义特性路由模块中的路由，而不用修改主路由配置。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Remove the `HeroListComponent` import and the `/heroes` route from the `app-routing.module.ts`.
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								移除 `HeroListComponent` 的导入和来自 `app-routing.module.ts` 中的 `/heroes` 路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								**Leave the default and the wildcard routes!**
 								These are concerns at the top level of the application itself.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								**保留默认路由和通配符路由！**
 								它们是应用程序顶层该自己处理的关注点。
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app-routing.module.2.ts" header="src/app/app-routing.module.ts (v2)"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a merge-hero-routes}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								#### Remove heroes declarations
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								#### 移除英雄列表的声明
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Remove the `HeroListComponent` from the `AppModule`'s `declarations` because it's now provided by the `HeroesModule`. You can evolve the hero feature with more components and different routes. That's a key benefit of creating a separate module for each feature area.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								从 `AppModule` 的 `declarations` 中移除 `HeroListComponent`，因为它现在已经改由 `HeroesModule` 提供了。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你可以让“英雄”特性独立演化，添加更多的组件或各种各样的路由。
 								这就是为每个特性区创建独立模块后获得的核心优势。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								After these steps, the `AppModule` should look like this:
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								经过这些步骤，`AppModule` 变成了这样：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: add Animations import in Router doc (#33740)

Fixes #33665

PR Close #33740

											
										
										
											2019-11-11 14:02:52 -05:00
+								<code-example path="router/src/app/app.module.3.ts" header="src/app/app.module.ts" region="remove-heroes"></code-example>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
 								{@a routing-module-order}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								### Module import order matters
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 导入模块的顺序很重要
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Look at the module `imports` array. Notice that the `AppRoutingModule` is _last_.
 								Most importantly, it comes _after_ the `HeroesModule`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								看看该模块的 `imports` 数组。注意，`AppRoutingModule` 是*最后一个*。最重要的是，它位于 `HeroesModule` 之后。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	.nvmrc
#	aio/content/cli/index.md
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/app-shell.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bazel.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/build.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/cli-builder.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/complex-animation-sequences.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/creating-libraries.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-navtree.md
#	aio/content/guide/dependency-injection-providers.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/deprecations.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/dynamic-form.md
#	aio/content/guide/elements.md
#	aio/content/guide/entry-components.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/file-structure.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms-overview.md
#	aio/content/guide/forms.md
#	aio/content/guide/frequent-ngmodules.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/ivy.md
#	aio/content/guide/language-service.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/module-types.md
#	aio/content/guide/ngmodule-api.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/providers.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/releases.md
#	aio/content/guide/reusable-animations.md
#	aio/content/guide/route-animations.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/schematics-authoring.md
#	aio/content/guide/schematics-for-libraries.md
#	aio/content/guide/schematics.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-devops.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-local.md
#	aio/content/guide/sharing-ngmodules.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/static-query-migration.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/transition-and-triggers.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade-setup.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/using-libraries.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/web-worker.md
#	aio/content/guide/workspace-config.md
#	aio/content/marketing/events.html
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/content/start/data.md
#	aio/content/start/deployment.md
#	aio/content/start/forms.md
#	aio/content/start/index.md
#	aio/content/start/routing.md
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/app/app.component.spec.ts
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/app/layout/mode-banner/mode-banner.component.ts
#	aio/src/app/layout/nav-item/nav-item.component.html
#	aio/src/app/shared/toc.service.ts
#	aio/src/styles/0-base/_typography.scss
#	aio/src/styles/2-modules/_api-pages.scss
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/yarn.lock
#	packages/common/http/src/headers.ts
#	packages/common/http/src/interceptor.ts
#	packages/common/http/src/params.ts
#	packages/common/http/src/response.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/date_pipe.ts
#	packages/core/src/change_detection/pipe_transform.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/directives.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render3/component_ref.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/form_builder.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/directives/router_outlet.ts
#	packages/router/src/events.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts
#	packages/router/src/shared.ts

											
										
										
											2020-01-11 18:10:12 +08:00
+								<code-example path="router/src/app/app.module.3.ts" region="module-imports" header="src/app/app.module.ts (module-imports)"></code-example>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								The order of route configuration matters.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The router accepts the first route that matches a navigation request path.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								路由配置的顺序很重要。
 								路由器会接受第一个匹配上导航所要求的路径的那个路由。
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								When all routes were in one `AppRoutingModule`,
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								you put the default and [wildcard](#wildcard) routes last, after the `/heroes` route,
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								so that the router had a chance to match a URL to the `/heroes` route _before_
 								hitting the wildcard route and navigating to "Page not found".
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								当所有路由都在同一个 `AppRoutingModule` 时，你要把默认路由和[通配符路由](guide/router#wildcard)放在最后（这里是在 `/heroes` 路由后面），
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								这样路由器才有机会匹配到 `/heroes` 路由，否则它就会先遇到并匹配上该通配符路由，并导航到“页面未找到”路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								The routes are no longer in one file.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								They are distributed across two modules, `AppRoutingModule` and `HeroesRoutingModule`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								这些路由不再位于单一文件中。他们分布在两个不同的模块中：`AppRoutingModule` 和 `HeroesRoutingModule`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Each routing module augments the route configuration _in the order of import_.
 								If you list `AppRoutingModule` first, the wildcard route will be registered
 								_before_ the hero routes.
-												fix: sync to 6.0(WIP)

											
										
										
											2018-05-10 13:55:06 +08:00
+								The wildcard route&mdash;which matches _every_ URL&mdash;will intercept the attempt to navigate to a hero route.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								每个路由模块都会根据*导入的顺序*把自己的路由配置追加进去。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								如果你先列出了 `AppRoutingModule`，那么通配符路由就会被注册在“英雄管理”路由*之前*。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								通配符路由（它匹配*任意*URL）将会拦截住每一个到“英雄管理”路由的导航，因此事实上屏蔽了所有“英雄管理”路由。
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Reverse the routing modules and see for yourself that
 								a click of the heroes link results in "Page not found".
 								Learn about inspecting the runtime router configuration
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								[below](#inspect-config "Inspect the router config").
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								反转路由模块的导入顺序，你就会看到当点击英雄相关的链接时被导向了“页面未找到”路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								要学习如何在运行时查看路由器配置，参见[稍后的内容](guide/router#inspect-config "Inspect the router config")。
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								### Route Parameters
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								### 路由参数
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a route-def-with-parameter}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								#### Route definition with a parameter
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								#### 带参数的路由定义
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Return to the `HeroesRoutingModule` and look at the route definitions again.
 								The route to `HeroDetailComponent` has a twist.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								回到 `HeroesRoutingModule` 并再次检查这些路由定义。
 								`HeroDetailComponent` 的路由有点特殊。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/heroes-routing.module.1.ts" header="src/app/heroes/heroes-routing.module.ts (excerpt)" region="hero-detail-route"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Notice the `:id` token in the path. That creates a slot in the path for a **Route Parameter**.
 								In this case, the router will insert the `id` of a hero into that slot.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								注意路径中的 `:id` 令牌。它为*路由参数*在路径中创建一个“空位”。在这里，路由器把英雄的 `id` 插入到那个“空位”中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								If you tell the router to navigate to the detail component and display "Magneta",
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								you expect a hero id to appear in the browser URL like this:
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								如果要告诉路由器导航到详情组件，并让它显示“Magneta”，你会期望这个英雄的 `id` 像这样显示在浏览器的 URL 中：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								<code-example format="nocode">
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								  localhost:4200/hero/15
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								</code-example>
 								If a user enters that URL into the browser address bar, the router should recognize the
 								pattern and go to the same "Magneta" detail view.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								如果用户把此 URL 输入到浏览器的地址栏中，路由器就会识别出这种模式，同样进入“Magneta”的详情视图。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								<div class="callout is-helpful">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 翻译了所有遗漏的部分。

											
										
										
											2018-03-24 11:16:33 +08:00
+								<header>Route parameter: Required or optional?</header>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												fix: 翻译了所有遗漏的部分。

											
										
										
											2018-03-24 11:16:33 +08:00
+								<header>路由参数：必须的还是可选的？</header>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Embedding the route parameter token, `:id`,
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								in the route definition path is a good choice for this scenario
 								because the `id` is *required* by the `HeroDetailComponent` and because
 								the value `15` in the path clearly distinguishes the route to "Magneta" from
 								a route for some other hero.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								在这个场景下，把路由参数的令牌 `:id` 嵌入到路由定义的 `path` 中是一个好主意，因为对于 `HeroDetailComponent` 来说 `id` 是*必须的*，
 								而且路径中的值 `15` 已经足够把到“Magneta”的路由和到其它英雄的路由明确区分开。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
 								{@a route-parameters}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								#### Setting the route parameters in the list view
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								#### 在列表视图中设置路由参数
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								After navigating to the `HeroDetailComponent`, you expect to see the details of the selected hero.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								You need *two* pieces of information: the routing path to the component and the hero's `id`.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								然后导航到 `HeroDetailComponent` 组件。在那里，你期望看到所选英雄的详情，这需要两部分信息：导航目标和该英雄的 `id`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Accordingly, the _link parameters array_ has *two* items:  the routing _path_ and a _route parameter_ that specifies the
 								`id` of the selected hero.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								因此，这个*链接参数数组*中有两个条目：目标路由的**`path`（路径）**，和一个用来指定所选英雄 `id` 的**路由参数**。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/hero-list/hero-list.component.1.html" header="src/app/heroes/hero-list/hero-list.component.html (link-parameters-array)" region="link-parameters-array"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								The router composes the destination URL from the array like this:
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								`localhost:4200/hero/15`.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								路由器从该数组中组合出了目标 URL：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								`localhost:3000/hero/15`。
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								How does the target `HeroDetailComponent` learn about that `id`?
 								Don't analyze the URL. Let the router do it.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								目标组件 `HeroDetailComponent` 该怎么知道这个 `id` 参数呢？
 								当然不会是自己去分析 URL 了！那是路由器的工作。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The router extracts the route parameter (`id:15`) from the URL and supplies it to
 								the `HeroDetailComponent` via the `ActivatedRoute` service.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:15:36 +08:00
+								路由器从 URL 中解析出路由参数（`id:15`），并通过 **ActivatedRoute** 服务来把它提供给 `HeroDetailComponent` 组件。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a activated-route}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								### _Activated Route_ in action
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												fix: heads in original and translation must be same level

											
										
										
											2018-03-01 22:28:13 +08:00
+								### _Activated Route_ 实战
-												fix: translate all pure english titles

											
										
										
											2017-08-04 14:06:15 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								Import the `Router`, `ActivatedRoute`, and `ParamMap` tokens from the router package.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								从路由器（`router`）包中导入 `Router`、`ActivatedRoute` 和 `Params` 类。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.1.ts" header="src/app/heroes/hero-detail/hero-detail.component.ts (activated route)" region="imports"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Import the `switchMap` operator because you need it later to process the `Observable` route parameters.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								这里导入 `switchMap` 操作符是因为你稍后将会处理路由参数的可观察对象 `Observable`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.3.ts" header="src/app/heroes/hero-detail/hero-detail.component.ts (switchMap operator import)" region="rxjs-operator-import"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a hero-detail-ctor}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								As usual, you write a constructor that asks Angular to inject services
 								that the component requires and reference them as private variables.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								通常，你会直接写一个构造函数，让 Angular 把组件所需的服务注入进来，自动定义同名的私有变量，并把它们存进去。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.3.ts" header="src/app/heroes/hero-detail/hero-detail.component.ts (constructor)" region="ctor"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Later, in the `ngOnInit` method, you use the `ActivatedRoute` service to retrieve the parameters for the route,
 								pull the hero `id` from the parameters and retrieve the hero to display.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								然后，在 `ngOnInit` 方法中，你用 `ActivatedRoute` 服务来接收路由的参数，从参数中取得该英雄的 `id`，并接收此英雄用于显示。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.3.ts" header="src/app/heroes/hero-detail/hero-detail.component.ts (ngOnInit)" region="ngOnInit"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								The `paramMap` processing is a bit tricky. When the map changes, you `get()`
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								the `id` parameter from the changed parameters.
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												fix: 翻译《路由与导航》中遗漏的部分
fix: 把 header 修复成双行对照的格式

											
										
										
											2018-03-14 09:13:52 +08:00
+								`paramMap` 的处理过程有点稍复杂。当这个 map 的值变化时，你可以从变化之后的参数中 `get()` 到其 `id` 参数。
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								Then you tell the `HeroService` to fetch the hero with that `id` and return the result of the `HeroService` request.
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												fix: 翻译《路由与导航》中遗漏的部分
fix: 把 header 修复成双行对照的格式

											
										
										
											2018-03-14 09:13:52 +08:00
+								然后，让 `HeroService` 去获取一个具有此 `id` 的英雄，并返回这个 `HeroService` 请求的结果。
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								You might think to use the RxJS `map` operator.
 								But the `HeroService` returns an `Observable<Hero>`.
 								So you flatten the `Observable` with the `switchMap` operator instead.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你可能想使用 RxJS 的 `map` 操作符。
 								但 `HeroService` 返回的是一个 `Observable<Hero>`。
 								所以你要改用 `switchMap` 操作符来打平这个 `Observable`。
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								The `switchMap` operator also cancels previous in-flight requests. If the user re-navigates to this route
 								with a new `id` while the `HeroService` is still retrieving the old `id`, `switchMap` discards that old request and returns the hero for the new `id`.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								`switchMap` 操作符还会取消以前未完成的在途请求。如果用户使用新的 `id` 再次导航到该路由，而 `HeroService` 仍在接受老 `id` 对应的英雄，那么 `switchMap` 就会抛弃老的请求，并返回这个新 `id` 的英雄信息。
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								The observable `Subscription` will be handled by the `AsyncPipe` and the component's `hero` property will be (re)set with the retrieved hero.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								这个可观察对象的 `Subscription`（订阅）将会由 `AsyncPipe` 处理，并且组件的 `hero` 属性将会设置为刚刚接收到的这个英雄。
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								#### _ParamMap_ API
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): fix URLSearchParams interface link to MDN

Fixes #18367

											
										
										
											2017-07-27 11:42:27 +02:00
+								The `ParamMap` API is inspired by the [URLSearchParams interface](https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams). It provides methods
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								to handle parameter access for both route parameters (`paramMap`) and query parameters (`queryParamMap`).
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
+								`ParamMap` API 是参照[URLSearchParams 接口](https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams)来设计的。它提供了一些方法来处理对路由参数（`paramMap`）和查询参数(`queryParamMap`)中的参数访问。
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								<table>
 								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <th>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								      Member
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
+								      成员
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </th>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <th>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								      Description
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												fix: 合并第二版的翻译

											
										
										
											2018-03-07 14:35:57 +08:00
+								      说明
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </th>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  </tr>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								      <code>has(name)</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    Returns `true` if the parameter name is in the map of parameters.
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
+								    如果参数名位于参数列表中，就返回 `true` 。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  </tr>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								      <code>get(name)</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								    Returns the parameter name value (a `string`) if present, or `null` if the parameter name is not in the map. Returns the _first_ element if the parameter value is actually an array of values.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								    如果这个 map 中有参数名对应的参数值（字符串），就返回它，否则返回 `null`。如果参数值实际上是一个数组，就返回它的*第一个*元素。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  </tr>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								      <code>getAll(name)</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    Returns a `string array` of the parameter name value if found, or an empty `array` if the parameter name value is not in the map. Use `getAll` when a single parameter could have multiple values.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								    如果这个 map 中有参数名对应的值，就返回一个字符串数组，否则返回空数组。当一个参数名可能对应多个值的时候，请使用 `getAll`。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  </tr>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  <tr>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								      <code>keys</code>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    <td>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    Returns a `string array` of all parameter names in the map.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								    返回这个 map 中的所有参数名组成的字符串数组。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								    </td>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								  </tr>
 								</table>
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
 								{@a reuse}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								#### Observable <i>paramMap</i> and component reuse
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								#### <i>参数</i>的可观察对象（Observable）与组件复用
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								In this example, you retrieve the route parameter map from an `Observable`.
 								That implies that the route parameter map can change during the lifetime of this component.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在这个例子中，你接收了路由参数的 `Observable` 对象。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								这种写法暗示着这些路由参数在该组件的生存期内可能会变化。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								They might. By default, the router re-uses a component instance when it re-navigates to the same component type
 								without visiting a different component first. The route parameters could change each time.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								确实如此！默认情况下，如果它没有访问过其它组件就导航到了同一个组件实例，那么路由器倾向于复用组件实例。如果复用，这些参数可以变化。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Suppose a parent component navigation bar had "forward" and "back" buttons
 								that scrolled through the list of heroes.
 								Each click navigated imperatively to the `HeroDetailComponent` with the next or previous `id`.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								假设父组件的导航栏有“前进”和“后退”按钮，用来轮流显示英雄列表中中英雄的详情。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								  每次点击都会强制导航到带前一个或后一个 `id` 的 `HeroDetailComponent` 组件。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You don't want the router to remove the current `HeroDetailComponent` instance from the DOM only to re-create it for the next `id`.
 								That could be visibly jarring.
 								Better to simply re-use the same component instance and update the parameter.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你不希望路由器仅仅从 DOM 中移除当前的 `HeroDetailComponent` 实例，并且用下一个 `id` 重新创建它。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								  那可能导致界面抖动。
 								  更好的方式是复用同一个组件实例，并更新这些参数。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Unfortunately, `ngOnInit` is only called once per component instantiation.
 								You need a way to detect when the route parameters change from _within the same instance_.
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								The observable `paramMap` property handles that beautifully.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								不幸的是，`ngOnInit` 对每个实例只调用一次。
-												fix: 把中文中的_替换成*

											
										
										
											2018-03-22 17:24:05 +08:00
+								  你需要一种方式来检测*在同一个实例中*路由参数什么时候发生了变化。
-												fix:错别字及语法

											
										
										
											2018-08-23 21:51:48 +08:00
+								  而 `params` 属性这个可观察对象（Observable）干净漂亮地处理了这种情况。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								When subscribing to an observable in a component, you almost always arrange to unsubscribe when the component is destroyed.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								当在组件中订阅一个可观察对象时，你通常总是要在组件销毁时取消这个订阅。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								There are a few exceptional observables where this is not necessary.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `ActivatedRoute` observables are among the exceptions.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								但是也有少数例外情况不需要取消订阅。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`ActivateRoute` 中的各种可观察对象就是属于这种情况。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `ActivatedRoute` and its observables are insulated from the `Router` itself.
 								The `Router` destroys a routed component when it is no longer needed and the injected `ActivatedRoute` dies with it.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`ActivateRoute` 及其可观察对象都是由 `Router` 本身负责管理的。
 								`Router` 会在不再需要时销毁这个路由组件，而注入进去的 `ActivateRoute` 也随之销毁了。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Feel free to unsubscribe anyway. It is harmless and never a bad practice.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								不过，你仍然可以随意取消订阅，这不会造成任何损害，而且也不是一项坏的实践。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a snapshot}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								#### _Snapshot_: the _no-observable_ alternative
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								#### *Snapshot*（快照）：当不需要 Observable 时的替代品
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								_This_ application won't re-use the `HeroDetailComponent`.
 								The user always returns to the hero list to select another hero to view.
 								There's no way to navigate from one hero detail to another hero detail
 								without visiting the list component in between.
 								Therefore, the router creates a new `HeroDetailComponent` instance every time.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								本应用不需要复用 `HeroDetailComponent`。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								  用户总是会先返回英雄列表，再选择另一位英雄。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								  所以，不存在从一个英雄详情导航到另一个而不用经过英雄列表的情况。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								  这意味着路由器每次都会创建一个全新的 `HeroDetailComponent` 实例。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								When you know for certain that a `HeroDetailComponent` instance will *never, never, ever*
 								be re-used, you can simplify the code with the *snapshot*.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								假如你很确定这个 `HeroDetailComponent` 组件的实例*永远、永远*不会被复用，那就可以使用*快照*来简化这段代码。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								The `route.snapshot` provides the initial value of the route parameter map.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You can access the parameters directly without subscribing or adding observable operators.
 								It's much simpler to write and read:
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`route.snapshot` 提供了路由参数的初始值。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你可以通过它来直接访问参数，而不用订阅或者添加 Observable 的操作符。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								这样在读写时就会更简单：
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.2.ts" header="src/app/heroes/hero-detail/hero-detail.component.ts (ngOnInit snapshot)" region="snapshot"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								**Remember:** you only get the _initial_ value of the parameter map with this technique.
 								Stick with the observable `paramMap` approach if there's even a chance that the router
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								could re-use the component.
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								This sample stays with the observable `paramMap` strategy just in case.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把中文中的_替换成*

											
										
										
											2018-03-22 17:24:05 +08:00
+								**记住：**，用这种技巧，你只得到了这些参数的*初始*值。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								如果有可能连续多次导航到此组件，那么就该用 `paramMap` 可观察对象的方式。
 								这个例子中仍然使用了 `paramMap` 的可观察对象策略。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a nav-to-list}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								### Navigating back to the list component
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 导航回列表组件
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `HeroDetailComponent` has a "Back" button wired to its `gotoHeroes` method that navigates imperatively
 								back to the `HeroListComponent`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`HeroDetailComponent` 组件有一个“Back”按钮，关联到它的 `gotoHeroes` 方法，该方法会导航回 `HeroListComponent` 组件。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The router `navigate` method takes the same one-item _link parameters array_
 								that you can bind to a `[routerLink]` directive.
 								It holds the _path to the `HeroListComponent`_:
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								路由的 `navigate` 方法同样接受一个单条目的*链接参数数组*，你也可以把它绑定到 `[routerLink]` 指令上。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								它保存着**到 `HeroListComponent` 组件的路径**：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.1.ts" header="src/app/heroes/hero-detail/hero-detail.component.ts (excerpt)" region="gotoHeroes"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): fix lots of broken links

Closes #16317

											
										
										
											2017-04-30 22:10:32 +02:00
+								{@a optional-route-parameters}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								#### Route Parameters: Required or optional?
-												feat: add auto checker
fix: some translations found by auto checker

											
										
										
											2018-03-01 22:19:59 +08:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								#### 路由参数：必须还是可选？
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								Use [*route parameters*](#route-parameters) to specify a *required* parameter value *within* the route URL
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								as you do when navigating to the `HeroDetailComponent` in order to view the hero with *id* 15:
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								如果想导航到 `HeroDetailComponent` 以对 id 为 15 的英雄进行查看并编辑，就要在路由的 URL 中使用[*路由参数*](guide/router#route-parameters)来指定*必要*参数值。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
 								<code-example format="nocode">
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								  localhost:4200/hero/15
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								</code-example>
 								You can also add *optional* information to a route request.
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								For example, when returning to the hero-detail.component.ts list from the hero detail view,
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								it would be nice if the viewed hero was preselected in the list.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你也能在路由请求中添加*可选*信息。
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								比如，当从 hero-detail.component.ts 返回到列表时，如果能自动选中刚刚查看过的英雄就好了。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								<div class="lightbox">
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								  <img src='generated/images/guide/router/selected-hero.png' alt="Selected hero">
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								</div>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								You'll implement this feature in a moment by including the viewed hero's `id`
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								in the URL as an optional parameter when returning from the `HeroDetailComponent`.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								当从 `HeroDetailComponent` 返回时，你很快就会通过把正在查看的英雄的 `id` 作为可选参数包含在 URL 中来实现这个特性。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Optional information takes other forms. Search criteria are often loosely structured, e.g., `name='wind*'`.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Multiple values are common&mdash;`after='12/31/2015' & before='1/1/2017'`&mdash;in no
 								particular order&mdash;`before='1/1/2017' & after='12/31/2015'`&mdash; in a
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								variety of formats&mdash;`during='currentYear'`.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								可选信息有很多种形式。搜索条件通常就不是严格结构化的，比如 `name='wind*'`；有多个值也很常见，如 `after='12/31/2015'&before='1/1/2017'`；
 								而且顺序无关，如 `before='1/1/2017'&after='12/31/2015'`，还可能有很多种变体格式，如 `during='currentYear'`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								These kinds of parameters don't fit easily in a URL *path*. Even if you could define a suitable URL token scheme,
 								doing so greatly complicates the pattern matching required to translate an incoming URL to a named route.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								这么多种参数要放在 URL 的*路径*中可不容易。即使你能制定出一个合适的 URL 方案，实现起来也太复杂了，得通过模式匹配才能把 URL 翻译成命名路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Optional parameters are the ideal vehicle for conveying arbitrarily complex information during navigation.
 								Optional parameters aren't involved in pattern matching and afford flexibility of expression.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								可选参数是在导航期间传送任意复杂信息的理想载体。
 								可选参数不涉及到模式匹配并在表达上提供了巨大的灵活性。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The router supports navigation with optional parameters as well as required route parameters.
 								Define _optional_ parameters in a separate object _after_ you define the required route parameters.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								和必要参数一样，路由器也支持通过可选参数导航。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在你定义完必要参数之后，再通过一个*独立的对象*来定义*可选参数*。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								In general, prefer a *required route parameter* when
 								the value is mandatory (for example, if necessary to distinguish one route path from another);
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								prefer an *optional parameter* when the value is optional, complex, and/or multivariate.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								通常，对于强制性的值（比如用于区分两个路由路径的）使用*必备参数*；当这个值是可选的、复杂的或多值的时，使用可选参数。
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a optionally-selecting}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								#### Heroes list: optionally selecting a hero
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								#### 英雄列表：选定一个英雄（也可不选）
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								When navigating to the `HeroDetailComponent` you specified the _required_ `id` of the hero-to-edit in the
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								*route parameter* and made it the second item of the [_link parameters array_](#link-parameters-array).
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								当导航到 `HeroDetailComponent` 时，你可以在*路由参数*中指定一个所要编辑的英雄 `id`，只要把它作为[链接参数数组](guide/router#link-parameters-array)中的第二个条目就可以了。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/hero-list/hero-list.component.1.html" header="src/app/heroes/hero-list/hero-list.component.html (link-parameters-array)" region="link-parameters-array"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The router embedded the `id` value in the navigation URL because you had defined it
 								as a route parameter with an `:id` placeholder token in the route `path`:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								路由器在导航 URL 中内嵌了 `id` 的值，这是因为你把它用一个 `:id` 占位符当做路由参数定义在了路由的 `path` 中：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/heroes-routing.module.1.ts" header="src/app/heroes/heroes-routing.module.ts (hero-detail-route)" region="hero-detail-route"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								When the user clicks the back button, the `HeroDetailComponent` constructs another _link parameters array_
 								which it uses to navigate back to the `HeroListComponent`.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								当用户点击后退按钮时，`HeroDetailComponent` 构造了另一个*链接参数数组*，可以用它导航回 `HeroListComponent`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.1.ts" header="src/app/heroes/hero-detail/hero-detail.component.ts (gotoHeroes)" region="gotoHeroes"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								This array lacks a route parameter because you had no reason to send information to the `HeroListComponent`.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								该数组缺少一个路由参数，这是因为你那时没有理由往 `HeroListComponent` 发送信息。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Now you have a reason. You'd like to send the id of the current hero with the navigation request so that the
 								`HeroListComponent` can highlight that hero in its list.
 								This is a _nice-to-have_ feature; the list will display perfectly well without it.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								但现在有了。你要在导航请求中同时发送当前英雄的 id，以便 `HeroListComponent` 可以在列表中高亮这个英雄。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								  这是一个*有更好，没有也无所谓*的特性，就算没有它，列表照样能显示得很完美。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Send the `id` with an object that contains an _optional_ `id` parameter.
 								For demonstration purposes, there's an extra junk parameter (`foo`) in the object that the `HeroListComponent` should ignore.
 								Here's the revised navigation statement:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								传送一个包含*可选*`id` 参数的对象。
 								为了演示，这里还在对象中定义了一个没用的额外参数（`foo`），`HeroListComponent` 应该忽略它。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								下面是修改过的导航语句：
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.3.ts" header="src/app/heroes/hero-detail/hero-detail.component.ts (go to heroes)" region="gotoHeroes"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The application still works. Clicking "back" returns to the hero list view.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								该应用仍然能工作。点击“back”按钮返回英雄列表视图。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Look at the browser address bar.
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								注意浏览器的地址栏。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								It should look something like this, depending on where you run it:
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								它应该是这样的，不过也取决于你在哪里运行它：
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								<code-example language="bash">
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								  localhost:4200/heroes;id=15;foo=foo
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								</code-example>
 								The `id` value appears in the URL as (`;id=15;foo=foo`), not in the URL path.
 								The path for the "Heroes" route doesn't have an `:id` token.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`id` 的值像这样出现在 URL 中（`;id=15;foo=foo`），但不在 URL 的路径部分。
 								“Heroes”路由的路径部分并没有定义 `:id`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The optional route parameters are not separated by "?" and "&" as they would be in the URL query string.
 								They are **separated by semicolons ";"**
-												fix: sync to 6.0(WIP)

											
										
										
											2018-05-10 13:55:06 +08:00
+								This is *matrix URL* notation&mdash;something you may not have seen before.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								可选的路由参数没有使用“？”和“&”符号分隔，因为它们将用在 URL 查询字符串中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								它们是**用“;”分隔的**。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								这是*矩阵 URL*标记法 —— 你以前可能从未见过。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								*Matrix URL* notation is an idea first introduced
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								in a [1996 proposal](http://www.w3.org/DesignIssues/MatrixURIs.html) by the founder of the web, Tim Berners-Lee.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								*Matrix URL*写法首次提出是在[1996 提案](http://www.w3.org/DesignIssues/MatrixURIs.html)中，提出者是 Web 的奠基人：Tim Berners-Lee。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Although matrix notation never made it into the HTML standard, it is legal and
 								it became popular among browser routing systems as a way to isolate parameters
 								belonging to parent and child routes. The Router is such a system and provides
 								support for the matrix notation across browsers.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								虽然 Matrix 写法未曾进入过 HTML 标准，但它是合法的。而且在浏览器的路由系统中，它作为从父路由和子路由中单独隔离出参数的方式而广受欢迎。Angular 的路由器正是这样一个路由系统，并支持跨浏览器的 Matrix 写法。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The syntax may seem strange to you but users are unlikely to notice or care
 								as long as the URL can be emailed and pasted into a browser address bar
 								as this one can.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								这种语法对你来说可能有点奇怪，不过用户不会在意这一点，因为该 URL 可以正常的通过邮件发出去或粘贴到浏览器的地址栏中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a route-parameters-activated-route}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								### Route parameters in the *ActivatedRoute* service
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:15:36 +08:00
+								### *ActivatedRoute* 服务中的路由参数
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The list of heroes is unchanged. No hero row is highlighted.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								英雄列表仍没有改变，没有哪个英雄列被加亮显示。
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The <live-example></live-example> *does* highlight the selected
 								row because it demonstrates the final state of the application which includes the steps you're *about* to cover.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								At the moment this guide is describing the state of affairs *prior* to those steps.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								<live-example></live-example>*高亮了*选中的行，因为它演示的是应用的最终状态，因此包含了你*即将*接触到的步骤。
 								此刻，本文描述的仍是那些步骤*之前*的状态。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								The `HeroListComponent` isn't expecting any parameters at all and wouldn't know what to do with them.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You can change that.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								`HeroListComponent` 还完全不需要任何参数，也不知道该怎么处理它们。你可以改变这一点。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Previously, when navigating from the `HeroListComponent` to the `HeroDetailComponent`,
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								you subscribed to the route parameter map `Observable` and made it available to the `HeroDetailComponent`
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								in the `ActivatedRoute` service.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You injected that service in the constructor of the `HeroDetailComponent`.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								以前，当从 `HeroListComponent` 导航到 `HeroDetailComponent` 时，你通过 `ActivatedRoute` 服务订阅了路由参数这个 `Observable`，并让它能用在 `HeroDetailComponent` 中。
 								你把该服务注入到了 `HeroDetailComponent` 的构造函数中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								This time you'll be navigating in the opposite direction, from the `HeroDetailComponent` to the `HeroListComponent`.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								这次，你要进行反向导航，从 `HeroDetailComponent` 到 `HeroListComponent`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								First you extend the router import statement to include the `ActivatedRoute` service symbol:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								首先，你扩展该路由的导入语句，以包含进 `ActivatedRoute` 服务的类；
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/hero-list/hero-list.component.ts" header="src/app/heroes/hero-list/hero-list.component.ts (import)" region="import-router"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								Import the `switchMap` operator to perform an operation on the `Observable` of route parameter map.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								导入 `switchMap` 操作符，在路由参数的 `Observable` 对象上执行操作。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/hero-list/hero-list.component.ts" header="src/app/heroes/hero-list/hero-list.component.ts (rxjs imports)" region="rxjs-imports"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Then you inject the `ActivatedRoute` in the `HeroListComponent` constructor.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								接着，你注入 `ActivatedRoute` 到 `HeroListComponent` 的构造函数中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/hero-list/hero-list.component.ts" header="src/app/heroes/hero-list/hero-list.component.ts (constructor and ngOnInit)" region="ctor"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								The `ActivatedRoute.paramMap` property is an `Observable` map of route parameters. The `paramMap` emits a new map of values that includes `id`
 								when the user navigates to the component. In `ngOnInit` you subscribe to those values, set the `selectedId`, and get the heroes.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								ActivatedRoute.paramMap 属性是一个路由参数的可观察对象。当用户导航到这个组件时，paramMap 会发射一个新值，其中包含 `id`。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在 ngOnInit 中，你订阅了这些值，设置到 selectedId，并获取英雄数据。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								Update the template with a [class binding](guide/template-syntax#class-binding).
 								The binding adds the `selected` CSS class when the comparison returns `true` and removes it when `false`.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Look for it within the repeated `<li>` tag as shown here:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 部分 更新 替换成 修改

											
										
										
											2018-03-23 09:48:55 +08:00
+								用 [CSS 类绑定](guide/template-syntax#class-binding)更新模板，把它绑定到 `isSelected` 方法上。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								如果该方法返回 `true`，此绑定就会添加 CSS 类 `selected`，否则就移除它。
 								在 `<li>` 标记中找到它，就像这样：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/hero-list/hero-list.component.html" header="src/app/heroes/hero-list/hero-list.component.html"></code-example>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
 								Add some styles to apply when the list item is selected.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								当选中列表条目时，要添加一些样式。
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	.nvmrc
#	aio/content/cli/index.md
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/app-shell.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bazel.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/build.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/cli-builder.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/complex-animation-sequences.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/creating-libraries.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-navtree.md
#	aio/content/guide/dependency-injection-providers.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/deprecations.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/dynamic-form.md
#	aio/content/guide/elements.md
#	aio/content/guide/entry-components.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/file-structure.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms-overview.md
#	aio/content/guide/forms.md
#	aio/content/guide/frequent-ngmodules.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/ivy.md
#	aio/content/guide/language-service.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/module-types.md
#	aio/content/guide/ngmodule-api.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/providers.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/releases.md
#	aio/content/guide/reusable-animations.md
#	aio/content/guide/route-animations.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/schematics-authoring.md
#	aio/content/guide/schematics-for-libraries.md
#	aio/content/guide/schematics.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-devops.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-local.md
#	aio/content/guide/sharing-ngmodules.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/static-query-migration.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/transition-and-triggers.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade-setup.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/using-libraries.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/web-worker.md
#	aio/content/guide/workspace-config.md
#	aio/content/marketing/events.html
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/content/start/data.md
#	aio/content/start/deployment.md
#	aio/content/start/forms.md
#	aio/content/start/index.md
#	aio/content/start/routing.md
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/app/app.component.spec.ts
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/app/layout/mode-banner/mode-banner.component.ts
#	aio/src/app/layout/nav-item/nav-item.component.html
#	aio/src/app/shared/toc.service.ts
#	aio/src/styles/0-base/_typography.scss
#	aio/src/styles/2-modules/_api-pages.scss
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/yarn.lock
#	packages/common/http/src/headers.ts
#	packages/common/http/src/interceptor.ts
#	packages/common/http/src/params.ts
#	packages/common/http/src/response.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/date_pipe.ts
#	packages/core/src/change_detection/pipe_transform.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/directives.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render3/component_ref.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/form_builder.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/directives/router_outlet.ts
#	packages/router/src/events.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts
#	packages/router/src/shared.ts

											
										
										
											2020-01-11 18:10:12 +08:00
+								<code-example path="router/src/app/heroes/hero-list/hero-list.component.css" region="selected" header="src/app/heroes/hero-list/hero-list.component.css"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								When the user navigates from the heroes list to the "Magneta" hero and back, "Magneta" appears selected:
-												docs(aio): ensure blank lines before HTML blocks in markdown

											
										
										
											2017-03-30 20:04:18 +01:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								当用户从英雄列表导航到英雄“Magneta”并返回时，“Magneta”看起来是选中的：
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								<div class="lightbox">
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								  <img src='generated/images/guide/router/selected-hero.png' alt="Selected List">
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								</div>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The optional `foo` route parameter is harmless and continues to be ignored.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								这儿可选的 `foo` 路由参数人畜无害，并继续被忽略。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								### Adding routable animations
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								### 添加路由动画
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a route-animation}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								#### Adding animations to the routed component
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								#### 为路由组件添加动画
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The heroes feature module is almost complete, but what is a feature without some smooth transitions?
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								这个“英雄”特性模块就要完成了，但这个特性还没有平滑的转场效果。
-												docs: Refresh content on routable animations for router guide (#20023)

PR Close #20023

											
										
										
											2017-10-09 22:21:04 -05:00
+								This section shows you how to add some [animations](guide/animations) to the `HeroDetailComponent`.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在这一节，你将为*英雄详情*组件添加一些[动画](guide/animations)。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								First import the `BrowserAnimationsModule` and add it to the `imports` array:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								首先导入 `BrowserAnimationsModule`，并添加到 `imports` 数组中：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.module.ts" header="src/app/app.module.ts (animations-module)" region="animations-module"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Refresh content on routable animations for router guide (#20023)

PR Close #20023

											
										
										
											2017-10-09 22:21:04 -05:00
+								Next, add a `data` object to the routes for `HeroListComponent` and `HeroDetailComponent`. Transitions are based on `states` and you'll use the `animation` data from the route to provide a named animation `state` for the transitions.
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								接下来，为指向 `HeroListComponent` 和 `HeroDetailComponent` 的路由定义添加一个 `data` 对象。
 								转场是基于 `states` 的，你将使用来自路由的 `animation` 数据为转场提供一个有名字的动画 `state`。
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/heroes-routing.module.2.ts" header="src/app/heroes/heroes-routing.module.ts (animation data)"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								Create an `animations.ts` file in the root `src/app/` folder. The contents look like this:
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								在根目录 `src/app/` 下创建一个 `animations.ts`。内容如下：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/animations.ts" header="src/app/animations.ts (excerpt)"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								This file does the following:
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								该文件做了如下工作：
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								* Imports the animation symbols that build the animation triggers, control state, and manage transitions between states.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   导入动画符号以构建动画触发器、控制状态并管理状态之间的过渡。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Refresh content on routable animations for router guide (#20023)

PR Close #20023

											
										
										
											2017-10-09 22:21:04 -05:00
+								* Exports a constant named `slideInAnimation` set to an animation trigger named *`routeAnimation`*;
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								   导出了一个名叫 `slideInAnimation` 的常量，并把它设置为一个名叫*`routeAnimation` 的动画触发器。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Refresh content on routable animations for router guide (#20023)

PR Close #20023

											
										
										
											2017-10-09 22:21:04 -05:00
+								* Defines one *transition* when switching back and forth from the `heroes` and `hero` routes to ease the component in from the left of the screen as it enters the application view (`:enter`), the other to animate the component to the right as it leaves the application view (`:leave`).
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								  定义一个*转场动画*，当在 `heroes` 和 `hero` 路由之间来回切换时，如果进入（`:enter`）应用视图则让组件从屏幕的左侧滑入，如果离开（`:leave`）应用视图则让组件从右侧划出。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Refresh content on routable animations for router guide (#20023)

PR Close #20023

											
										
										
											2017-10-09 22:21:04 -05:00
+								You could also create more transitions for other routes. This trigger is sufficient for the current milestone.
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								你还可以为其它路由组件用不同的转场效果创建更多触发器。现在这个触发器已经足够当前的里程碑用了。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								Back in the `AppComponent`, import the `RouterOutlet` token from the `@angular/router` package and the `slideInAnimation` from
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								`'./animations.ts`.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								回到 `AppComponent`，从 `@angular/router` 中导入 `RouterOutlet` 令牌，并从 `'./animations.ts` 中导入 `slideInDownAnimation`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(router): change slideInDownAnimation into slideInAnimation (#28640)

In the Routing & Navigation there is a typo - slideInDownAnimation, but it should be slideInAnimation

PR Close #28572

PR Close #28640

											
										
										
											2019-02-11 10:42:37 +01:00
+								Add an `animations` array to the `@Component` metadata's that contains the `slideInAnimation`.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								把一个包含 `slideInDownAnimation` 的 `animations` 数组添加到 `@Component` 的元数据中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.component.2.ts" header="src/app/app.component.ts (animations)" region="animation-imports"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Refresh content on routable animations for router guide (#20023)

PR Close #20023

											
										
										
											2017-10-09 22:21:04 -05:00
+								In order to use the routable animations, you'll need to wrap the `RouterOutlet` inside an element. You'll
 								use the `@routeAnimation` trigger and bind it to the element.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								为了使用路由动画，你需要把 `RouterOutlet` 包装到一个元素中。你要把 `@routeAnimation` 触发器绑定到该元素上。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Refresh content on routable animations for router guide (#20023)

PR Close #20023

											
										
										
											2017-10-09 22:21:04 -05:00
+								For the `@routeAnimation` transitions to key off states, you'll need to provide it with the `data` from the `ActivatedRoute`. The `RouterOutlet` is exposed as an `outlet` template variable, so you bind a reference to the router outlet. A variable of `routerOutlet` is an ideal choice.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								为了把 `@routeAnimation` 转场转场到指定的状态，你需要从 `ActivatedRoute` 的 `data` 中提供它。
 								`RouterOutlet` 导出成了一个模板变量 `outlet`，这样你就可以绑定一个到路由出口的引用了。给这个变量取名做 `routerOutlet` 是一个理想的选择。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.component.2.html" header="src/app/app.component.html (router outlet)"></code-example>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: fix naming miss and improve anchor reference in router guide (#30225)

Signed-off-by: Richard Lea <chigix@zoho.com>

PR Close #30225

											
										
										
											2019-05-01 21:19:02 +09:00
+								The `@routeAnimation` property is bound to the `getAnimationData` with the provided `routerOutlet` reference, so you'll need to define that function in the `AppComponent`. The `getAnimationData` function returns the animation property from the `data` provided through the `ActivatedRoute`. The `animation` property matches the `transition` names you used in the `slideInAnimation` defined in `animations.ts`.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								`@routeAnimation` 属性使用所提供的 `routerOutlet` 引用来绑定到 `getAnimationData`，因此你需要在 `AppComponent` 中定义那个函数。`getAnimationData` 函数会根据 `ActivatedRoute` 所提供的 `data` 对象返回动画的属性。`animation` 属性会根据你在 `animations.ts` 中定义 `slideInAnimation` 时使用的 `transition` 名称进行匹配。
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.component.2.ts" header="src/app/app.component.ts (router outlet)" region="function-binding"></code-example>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Refresh content on routable animations for router guide (#20023)

PR Close #20023

											
										
										
											2017-10-09 22:21:04 -05:00
+								When switching between the two routes, the `HeroDetailComponent` and `HeroListComponent` will ease in from the left when routed to and will slide to the right when navigating away.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								如果在两个路由之间切换，导航进来时，`HeroDetailComponent` 和 `HeroListComponent` 会从左侧滑入；导航离开时将会从右侧划出。
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a milestone-3-wrap-up}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								### Milestone 3 wrap up
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix:修复路由与导航章节的目录序号及格式
											
										
										
											2018-12-17 18:26:55 +08:00
+								### 里程碑 3 的总结
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								You've learned how to do the following:
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你学到了如何：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Organize the app into *feature areas*.
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
 								   把应用组织成*特性区*
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Navigate imperatively from one component to another.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   命令式的从一个组件导航到另一个
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Pass information along in route parameters and subscribe to them in the component.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   通过路由参数传递信息，并在组件中订阅它们
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Import the feature area NgModule into the `AppModule`.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   把这个特性分区模块导入根模块 `AppModule`
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Refresh content on routable animations for router guide (#20023)

PR Close #20023

											
										
										
											2017-10-09 22:21:04 -05:00
+								* Applying routable animations based on the page.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   把动画应用到路由组件上
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								After these changes, the folder structure looks like this:
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								做完这些修改之后，目录结构是这样的：
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								<div class='filetree'>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								  <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								    angular-router-sample
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								  </div>
 								  <div class='children'>
 								    <div class='file'>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								      src
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
 								    <div class='children'>
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								    <div class='file'>
 								      app
 								    </div>
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      <div class='children'>
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								        crisis-list
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      </div>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								          <div class='children'>
 								            <div class='file'>
 								              crisis-list.component.css
 								            </div>
 								            <div class='file'>
 								              crisis-list.component.html
 								            </div>
 								            <div class='file'>
 								              crisis-list.component.ts
 								            </div>
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								          </div>
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
 								        <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								          heroes
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								        </div>
 								        <div class='children'>
 								          <div class='file'>
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
 								hero-detail
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								          </div>
 								            <div class='children'>
 								              <div class='file'>
 								                hero-detail.component.css
 								              </div>
 								              <div class='file'>
 								                hero-detail.component.html
 								              </div>
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								              <div class='file'>            hero-detail.component.ts
 								          </div>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
 								            </div>
 								          <div class='file'>
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
 								hero-list
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								          </div>
 								            <div class='children'>
 								              <div class='file'>
 								                hero-list.component.css
 								              </div>
 								              <div class='file'>
 								                hero-list.component.html
 								              </div>
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								              <div class='file'>            hero-list.component.ts
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								          </div></div>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
 								          <div class='file'>
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								            hero.service.ts
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								          </div>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
 								          <div class='file'>
 								            hero.ts
 								          </div>
 								          <div class='file'>
 								            heroes-routing.module.ts
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								          </div>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
 								          <div class='file'>
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								            heroes.module.ts
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								          </div>
 								          <div class='file'>
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								            mock-heroes.ts
 								          </div>
 								        </div>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        <div class='file'>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								          page-not-found
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        </div>
 								        <div class='children'>
 								          <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								            page-not-found.component.css
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								          </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								          <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								            page-not-found.component.html
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								          </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								          <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								            page-not-found.component.ts
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								          </div>
-												fix: 移除纯粹由空格组成的行，它会导致错误的 markdown 编译

											
										
										
											2019-01-01 22:17:43 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      </div>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      <div class='file'>
 								        animations.ts
 								      </div>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      <div class='file'>
 								        app.component.css
 								      </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      <div class='file'>
 								        app.component.html
 								      </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								          app.component.ts
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								          app.module.ts
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								          app-routing.module.ts
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								        <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								          main.ts
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 移除纯粹由空格组成的行，它会导致错误的 markdown 编译

											
										
										
											2019-01-01 22:17:43 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								        message.service.ts
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								        index.html
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								        styles.css
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								        tsconfig.json
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								      </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								      node_modules ...
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								      package.json
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								  </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								</div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): more content fixes

											
										
										
											2017-05-09 22:01:04 +02:00
+								Here are the relevant files for this version of the sample application.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								这里是当前版本的范例程序相关文件。
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								<code-tabs>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="animations.ts" path="router/src/app/animations.ts">
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								  </code-pane>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="app.component.html" path="router/src/app/app.component.2.html">
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
 								  </code-pane>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="app.component.ts" path="router/src/app/app.component.2.ts">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								  </code-pane>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="app.module.ts" path="router/src/app/app.module.3.ts">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								  </code-pane>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="app-routing.module.ts" path="router/src/app/app-routing.module.2.ts" region="milestone3">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="hero-list.component.css" path="router/src/app/heroes/hero-list/hero-list.component.css">
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								  </code-pane>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="hero-list.component.html" path="router/src/app/heroes/hero-list/hero-list.component.html">
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								  </code-pane>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="hero-list.component.ts" path="router/src/app/heroes/hero-list/hero-list.component.ts">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="hero-detail.component.html" path="router/src/app/heroes/hero-detail/hero-detail.component.html">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="hero-detail.component.ts" path="router/src/app/heroes/hero-detail/hero-detail.component.3.ts">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="hero.service.ts" path="router/src/app/heroes/hero.service.ts">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="heroes.module.ts" path="router/src/app/heroes/heroes.module.ts">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								  </code-pane>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="heroes-routing.module.ts" path="router/src/app/heroes/heroes-routing.module.2.ts">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								  </code-pane>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="message.service.ts" path="router/src/app/message.service.ts">
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								  </code-pane>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								</code-tabs>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
 								{@a milestone-4}
 								## Milestone 4: Crisis center feature
-												fix:修复路由与导航章节的目录序号及格式
											
										
										
											2018-12-17 18:26:55 +08:00
+								## 里程碑 4：危机中心
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								It's time to add real features to the app's current placeholder crisis center.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								是时候往该应用的危机中心（现在是占位符）中添加一些真实的特性了。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Begin by imitating the heroes feature:
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								先从模仿“英雄管理”中的特性开始：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								* Create a `crisis-center` subfolder in the `src/app` folder.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								  在 `src/app` 目录下创建一个 `crisis-center` 子目录。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								* Copy the files and folders from `app/heroes` into the new `crisis-center` folder.
-												fix: 移除纯粹由空格组成的行，它会导致错误的 markdown 编译

											
										
										
											2019-01-01 22:17:43 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								   把 `app/heroes` 中的文件和目录复制到新的 `crisis-center` 文件夹中。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
+								* In the new files, change every mention of "hero" to "crisis", and "heroes" to "crises".
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
 								  在这些新建的文件中，把每个 "hero" 都改成 "crisis"，每个 "heroes" 都改成 "crises"。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								* Rename the NgModule files to `crisis-center.module.ts` and `crisis-center-routing.module.ts`.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 翻译错误 (#346)

											
										
										
											2018-12-20 09:24:49 +08:00
+								  把这些 NgModule 文件改名为 `crisis-center.module.ts` 和 `crisis-center-routing.module.ts`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								You'll use mock crises instead of mock heroes:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								你还要用模拟的危机列表替换模拟的英雄列表：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/crisis-center/mock-crises.ts" header="src/app/crisis-center/mock-crises.ts"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								The resulting crisis center is a foundation for introducing a new concept&mdash;**child routing**.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You can leave *Heroes* in its current state as a contrast with the *Crisis Center*
 								and decide later if the differences are worthwhile.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								最终的危机中心可以作为引入**子路由**这个新概念的基础。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你可以把*英雄管理*保持在当前状态，以便和*危机中心*进行对比，以后再根据这些差异是否有价值来决定后续行动。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								<div class="alert is-helpful">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
 								In keeping with the
-												docs(aio): remove _blank target (#16205)


											
										
										
											2017-04-24 20:23:45 +02:00
+								<a href="https://blog.8thlight.com/uncle-bob/2014/05/08/SingleReponsibilityPrinciple.html" title="Separation of Concerns">*Separation of Concerns* principle</a>,
-												docs(aio): remove unnecessary blank lines

											
										
										
											2017-03-31 12:23:16 +01:00
+								changes to the *Crisis Center* won't affect the `AppModule` or
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								any other feature's component.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								遵循<a href="https://blog.8thlight.com/uncle-bob/2014/05/08/SingleReponsibilityPrinciple.html" target="_blank" title="Separation of Concerns">*关注点分离（Separation of Concerns）*原则</a>，
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								对*危机中心*的修改不会影响 `AppModule` 或其它特性模块中的组件。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a crisis-child-routes}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								### A crisis center with child routes
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 带有子路由的危机中心
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								This section shows you how to organize the crisis center
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								to conform to the following recommended pattern for Angular applications:
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								本节会展示如何组织危机中心，来满足 Angular 应用所推荐的模式：
-												feat: add auto checker
fix: some translations found by auto checker

											
										
										
											2018-03-01 22:19:59 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								* Each feature area resides in its own folder.
 								   把每个特性放在自己的目录中。
-												feat: add auto checker
fix: some translations found by auto checker

											
										
										
											2018-03-01 22:19:59 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* Each feature has its own Angular feature module.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   每个特性都有自己的 Angular 特性模块。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* Each area has its own area root component.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   每个特性区都有自己的根组件。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* Each area root component has its own router outlet and child routes.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   每个特性区的根组件中都有自己的路由出口及其子路由。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* Feature area routes rarely (if ever) cross with routes of other features.
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   特性区的路由很少（或完全不）与其它特性区的路由交叉。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								If your app had many feature areas, the app component trees might look like this:
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								如果你还有更多特性区，它们的组件树是这样的：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								<div class="lightbox">
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								  <img src='generated/images/guide/router/component-tree.png' alt="Component Tree">
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								</div>
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
 								{@a child-routing-component}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								### Child routing component
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 子路由组件
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Generate a `CrisisCenter` component in the `crisis-center` folder:
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								在 `crisis-center` 目录下生成一个 `CrisisCenter` 组件：
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng generate component crisis-center/crisis-center
 								</code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Update the component template to look like this:
-												fix: add line break before `<code-example...`

											
										
										
											2017-08-04 07:39:15 +08:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								把组件模板修改成这样：
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/crisis-center/crisis-center/crisis-center.component.html" header="src/app/crisis-center/crisis-center/crisis-center.component.html"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								The `CrisisCenterComponent` has the following in common with the `AppComponent`:
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`CrisisCenterComponent` 和 `AppComponent` 有下列共同点：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
+								* It is the *root* of the crisis center area,
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								just as `AppComponent` is the root of the entire application.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   它是危机中心特性区的*根*，正如 `AppComponent` 是整个应用的根。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
+								* It is a *shell* for the crisis management feature area,
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								just as the `AppComponent` is a shell to manage the high-level workflow.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   它是危机管理特性区的*壳*，正如 `AppComponent` 是管理高层工作流的壳。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Like most shells, the `CrisisCenterComponent` class is very simple, simpler even than `AppComponent`:
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								it has no business logic, and its template has no links, just a title and
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								`<router-outlet>` for the crisis center child component.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								就像大多数的壳一样，`CrisisCenterComponent` 类也非常简单，甚至比 `AppComponent` 更简单：
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								它没有业务逻辑，它的模板中没有链接，只有一个标题和用于放置危机中心的子组件的 `<router-outlet>`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a child-route-config}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								### Child route configuration
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 子路由配置
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								As a host page for the "Crisis Center" feature, generate a `CrisisCenterHome` component in the `crisis-center` folder.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								在 `crisis-center` 目录下生成一个 `CrisisCenterHome` 组件，作为 "危机中心" 特性的宿主页面。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng generate component crisis-center/crisis-center-home
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								</code-example>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Update the template with a welcome message to the `Crisis Center`.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								用一条欢迎信息修改 `Crisis Center` 中的模板。
-												fix: 增补翻译

											
										
										
											2017-10-22 11:19:24 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/crisis-center/crisis-center-home/crisis-center-home.component.html" header="src/app/crisis-center/crisis-center-home/crisis-center-home.component.html"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Update the `crisis-center-routing.module.ts` you renamed after copying it from `heroes-routing.module.ts` file.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								This time, you define **child routes** *within* the parent `crisis-center` route.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								把 `heroes-routing.module.ts` 文件复制过来，改名为 `crisis-center-routing.module.ts`，并修改它。
 								这次你要把**子路由**定义在父路由 `crisis-center` 中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	.nvmrc
#	aio/content/cli/index.md
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/app-shell.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bazel.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/build.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/cli-builder.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/complex-animation-sequences.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/creating-libraries.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-navtree.md
#	aio/content/guide/dependency-injection-providers.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/deprecations.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/dynamic-form.md
#	aio/content/guide/elements.md
#	aio/content/guide/entry-components.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/file-structure.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms-overview.md
#	aio/content/guide/forms.md
#	aio/content/guide/frequent-ngmodules.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/ivy.md
#	aio/content/guide/language-service.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/module-types.md
#	aio/content/guide/ngmodule-api.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/providers.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/releases.md
#	aio/content/guide/reusable-animations.md
#	aio/content/guide/route-animations.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/schematics-authoring.md
#	aio/content/guide/schematics-for-libraries.md
#	aio/content/guide/schematics.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-devops.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-local.md
#	aio/content/guide/sharing-ngmodules.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/static-query-migration.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/transition-and-triggers.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade-setup.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/using-libraries.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/web-worker.md
#	aio/content/guide/workspace-config.md
#	aio/content/marketing/events.html
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/content/start/data.md
#	aio/content/start/deployment.md
#	aio/content/start/forms.md
#	aio/content/start/index.md
#	aio/content/start/routing.md
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/app/app.component.spec.ts
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/app/layout/mode-banner/mode-banner.component.ts
#	aio/src/app/layout/nav-item/nav-item.component.html
#	aio/src/app/shared/toc.service.ts
#	aio/src/styles/0-base/_typography.scss
#	aio/src/styles/2-modules/_api-pages.scss
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/yarn.lock
#	packages/common/http/src/headers.ts
#	packages/common/http/src/interceptor.ts
#	packages/common/http/src/params.ts
#	packages/common/http/src/response.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/date_pipe.ts
#	packages/core/src/change_detection/pipe_transform.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/directives.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render3/component_ref.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/form_builder.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/directives/router_outlet.ts
#	packages/router/src/events.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts
#	packages/router/src/shared.ts

											
										
										
											2020-01-11 18:10:12 +08:00
+								<code-example path="router/src/app/crisis-center/crisis-center-routing.module.1.ts" header="src/app/crisis-center/crisis-center-routing.module.ts (Routes)" region="routes"></code-example>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Notice that the parent `crisis-center` route has a `children` property
 								with a single route containing the `CrisisListComponent`. The `CrisisListComponent` route
 								also has a `children` array with two routes.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								注意，父路由 `crisis-center` 有一个 `children` 属性，它有一个包含 `CrisisListComponent` 的路由。
 								`CrisisListModule` 路由还有一个带两个路由的 `children` 数组。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								These two routes navigate to the crisis center child components,
 								`CrisisCenterHomeComponent` and `CrisisDetailComponent`, respectively.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								这两个路由导航到了*危机中心*的两个子组件：`CrisisCenterHomeComponent` 和 `CrisisDetailComponent`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								There are *important differences* in the way the router treats these _child routes_.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								对这些路由的处理中有一些*重要的不同*。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The router displays the components of these routes in the `RouterOutlet`
 								of the `CrisisCenterComponent`, not in the `RouterOutlet` of the `AppComponent` shell.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								路由器会把这些路由对应的组件放在 `CrisisCenterComponent` 的 `RouterOutlet` 中，而不是 `AppComponent` 壳组件中的。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `CrisisListComponent` contains the crisis list and a `RouterOutlet` to
 								display the `Crisis Center Home` and `Crisis Detail` route components.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`CrisisListComponent` 包含危机列表和一个 `RouterOutlet`，用以显示 `Crisis Center Home` 和 `Crisis Detail` 这两个路由组件。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								The `Crisis Detail` route is a child of the `Crisis List`. The router [reuses components](#reuse)
 								by default, so the `Crisis Detail` component will be re-used as you select different crises.
-												docs: fix naming miss and improve anchor reference in router guide (#30225)

Signed-off-by: Richard Lea <chigix@zoho.com>

PR Close #30225

											
										
										
											2019-05-01 21:19:02 +09:00
+								In contrast, back in the `Hero Detail` route, [the component was recreated](#snapshot-the-no-observable-alternative) each time you selected a different hero from the list of heroes.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								`Crisis Detail` 路由是 `Crisis List` 的子路由。由于路由器默认会[复用组件](#reuse)，因此当你选择了另一个危机时，`CrisisDetailComponent` 会被复用。
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								作为对比，回头看看 `Hero Detail` 路由，每当你从列表中选择了不同的英雄时，[都会重新创建该组件](#snapshot-the-no-observable-alternative)。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								At the top level, paths that begin with `/` refer to the root of the application.
 								But child routes *extend* the path of the parent route.
 								With each step down the route tree,
 								you add a slash followed by the route path, unless the path is _empty_.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								在顶级，以 `/` 开头的路径指向的总是应用的根。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								但这里是子路由。
 								它们是在父路由路径的基础上做出的扩展。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在路由树中每深入一步，你就会在该路由的路径上添加一个斜线 `/`（除非该路由的路径是*空的*）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Apply that logic to navigation within the crisis center for which the parent path is `/crisis-center`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								如果把该逻辑应用到危机中心中的导航，那么父路径就是 `/crisis-center`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* To navigate to the `CrisisCenterHomeComponent`, the full URL is `/crisis-center` (`/crisis-center` + `''` + `''`).
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   要导航到 `CrisisCenterHomeComponent`，完整的 URL 是 `/crisis-center` (`/crisis-center` + `''` + `''`)。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* To navigate to the `CrisisDetailComponent` for a crisis with `id=2`, the full URL is
 								`/crisis-center/2` (`/crisis-center` + `''` +  `'/2'`).
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   要导航到 `CrisisDetailComponent` 以展示 `id=2` 的危机，完整的 URL 是 `/crisis-center/2` (`/crisis-center` + `''` + `'/2'`)。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The absolute URL for the latter example, including the `localhost` origin, is
-												docs(aio): ensure blank lines before HTML blocks in markdown

											
										
										
											2017-03-30 20:04:18 +01:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								本例子中包含站点部分的绝对 URL，就是：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								<code-example>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								  localhost:4200/crisis-center/2
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								</code-example>
 								Here's the complete `crisis-center-routing.module.ts` file with its imports.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								这里是完整的 `crisis-center.routing.ts` 及其导入语句。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/crisis-center/crisis-center-routing.module.1.ts" header="src/app/crisis-center/crisis-center-routing.module.ts (excerpt)"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a import-crisis-module}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								### Import crisis center module into the *AppModule* routes
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								### 把危机中心模块导入到 `AppModule` 的路由中
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								As with the `HeroesModule`, you must add the `CrisisCenterModule` to the `imports` array of the `AppModule`
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								_before_ the `AppRoutingModule`:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								就像 `HeroesModule` 模块中一样，你必须把 `CrisisCenterModule` 添加到 `AppModule` 的 `imports` 数组中，就在 `AppRoutingModule` 前面：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-tabs>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane path="router/src/app/crisis-center/crisis-center.module.ts"header="src/app/crisis-center/crisis-center.module.ts">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								  </code-pane>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								  <code-pane path="router/src/app/app.module.4.ts" header="src/app/app.module.ts (import CrisisCenterModule)" region="crisis-center-module">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								  </code-pane>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								</code-tabs>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Remove the initial crisis center route from the `app-routing.module.ts`.
 								The feature routes are now provided by the `HeroesModule` and the `CrisisCenter` modules.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								从 `app.routing.ts` 中移除危机中心的初始路由。
 								这些特性路由现在是由 `HeroesModule` 和 `CrisisCenter` 特性模块提供的。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `app-routing.module.ts` file retains the top-level application routes such as the default and wildcard routes.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								`app-routing.module.ts` 文件中只有应用的顶级路由，比如默认路由和通配符路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app-routing.module.3.ts" header="src/app/app-routing.module.ts (v3)" region="v3"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a relative-navigation}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								### Relative navigation
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 相对导航
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								While building out the crisis center feature, you navigated to the
 								crisis detail route using an **absolute path** that begins with a _slash_.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								虽然构建出了危机中心特性区，你却仍在使用以斜杠开头的**绝对路径**来导航到危机详情的路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								The router matches such _absolute_ paths to routes starting from the top of the route configuration.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								路由器会从路由配置的顶层来匹配像这样的*绝对路径*。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You could continue to use absolute paths like this to navigate inside the *Crisis Center*
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								feature, but that pins the links to the parent routing structure.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								If you changed the parent `/crisis-center` path, you would have to change the link parameters array.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你固然可以继续像*危机中心*特性区一样使用绝对路径，但是那样会把链接钉死在特定的父路由结构上。
 								如果你修改了父路径 `/crisis-center`，那就不得不修改每一个链接参数数组。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You can free the links from this dependency by defining paths that are **relative** to the current URL segment.
 								Navigation _within_ the feature area remains intact even if you change the parent route path to the feature.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								通过改成定义*相对于*当前 URL 的路径，你可以把链接从这种依赖中解放出来。
 								当你修改了该特性区的父路由路径时，该特性区*内部*的导航仍然完好无损。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Here's an example:
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								例子如下：
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The router supports directory-like syntax in a _link parameters list_ to help guide route name lookup:
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								路由器支持在*链接参数数组*中使用“目录式”语法来为查询路由名提供帮助：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								`./` or `no leading slash` is relative to the current level.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`./` 或 ` 无前导斜线 ` 形式是相对于当前级别的。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								`../` to go up one level in the route path.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`../` 会回到当前路由路径的上一级。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								You can combine relative navigation syntax with an ancestor path.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								If you must navigate to a sibling route, you could use the `../<sibling>` convention to go up
 								one level, then over and down the sibling route path.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你可以把相对导航语法和一个祖先路径组合起来用。
 								如果不得不导航到一个兄弟路由，你可以用 `../<sibling>` 来回到上一级，然后进入兄弟路由路径中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								To navigate a relative path with the `Router.navigate` method, you must supply the `ActivatedRoute`
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								to give the router knowledge of where you are in the current route tree.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								用 `Router.navigate` 方法导航到相对路径时，你必须提供当前的 `ActivatedRoute`，来让路由器知道你现在位于路由树中的什么位置。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								After the _link parameters array_, add an object with a `relativeTo` property set to the `ActivatedRoute`.
 								The router then calculates the target URL based on the active route's location.
-												fix:修复路由和导航章节中的一个表述错误
											
										
										
											2018-12-19 10:27:39 +08:00
+								在*链接参数数组*后面，添加一个带有 `relativeTo` 属性的对象，并把它设置为当前的 `ActivatedRoute`。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								这样路由器就会基于当前激活路由的位置来计算出目标 URL。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								**Always** specify the complete _absolute_ path when calling router's `navigateByUrl` method.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								当调用路由器的 `navigateByUrl` 时，**总是**要指定完整的*绝对路径*。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a nav-to-crisis}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								### Navigate to crisis list with a relative URL
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								### 使用相对 URL 导航到危机列表
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								You've already injected the `ActivatedRoute` that you need to compose the relative navigation path.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你已经注入过了 `ActivatedRoute`，你需要把它来和相对导航路径组合在一起。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								When using a `RouterLink` to navigate instead of the `Router` service, you'd use the _same_
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								link parameters array, but you wouldn't provide the object with the `relativeTo` property.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `ActivatedRoute` is implicit in a `RouterLink` directive.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								如果用 `RouterLink` 来代替 `Router` 服务进行导航，就要使用*相同*的链接参数数组，不过不再需要提供 `relativeTo` 属性。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`ActivatedRoute` 已经隐含在了 `RouterLink` 指令中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Update the `gotoCrises` method of the `CrisisDetailComponent` to navigate back to the *Crisis Center* list using relative path navigation.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								修改 `CrisisDetailComponent` 的 `gotoCrises` 方法，来使用相对路径返回*危机中心*列表。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/crisis-center/crisis-detail/crisis-detail.component.ts" header="src/app/crisis-center/crisis-detail/crisis-detail.component.ts (relative navigation)" region="gotoCrises-navigate"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Notice that the path goes up a level using the `../` syntax.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								If the current crisis `id` is `3`, the resulting path back to the crisis list is  `/crisis-center/;id=3;foo=foo`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								注意这个路径使用了 `../` 语法返回上一级。
 								如果当前危机的 `id` 是 `3`，那么最终返回到的路径就是 `/crisis-center/;id=3;foo=foo`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a named-outlets}
 								### Displaying multiple routes in named outlets
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 用命名出口（outlet）显示多重路由
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You decide to give users a way to contact the crisis center.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								When a user clicks a "Contact" button, you want to display a message in a popup view.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你决定给用户提供一种方式来联系危机中心。
 								当用户点击“Contact”按钮时，你要在一个弹出框中显示一条消息。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								The popup should stay open, even when switching between pages in the application, until the user closes it
 								by sending the message or canceling.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Clearly you can't put the popup in the same outlet as the other pages.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								即使在应用中的不同页面之间切换，这个弹出框也应该始终保持打开状态，直到用户发送了消息或者手动取消。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								显然，你不能把这个弹出框跟其它放到页面放到同一个路由出口中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Until now, you've defined a single outlet and you've nested child routes
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								under that outlet to group routes together.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								The router only supports one primary _unnamed_ outlet per template.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								迄今为止，你只定义过单路由出口，并且在其中嵌套了子路由以便对路由分组。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								在每个模板中，路由器只能支持一个*无名*主路由出口。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								A template can also have any number of _named_ outlets.
 								Each named outlet has its own set of routes with their own components.
 								Multiple outlets can be displaying different content, determined by different routes, all at the same time.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								模板还可以有多个*命名的*路由出口。
 								每个命名出口都自己有一组带组件的路由。
 								多重出口可以在同一时间根据不同的路由来显示不同的内容。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Add an outlet named "popup" in the `AppComponent`, directly below the unnamed outlet.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								在 `AppComponent` 中添加一个名叫“popup”的出口，就在无名出口的下方。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.component.4.html" header="src/app/app.component.html (outlets)" region="outlets"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								That's where a popup will go, once you learn how to route a popup component to it.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								一旦你学会了如何把一个弹出框组件路由到该出口，那里就是将会出现弹出框的地方。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a secondary-routes}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								#### Secondary routes
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								#### 第二路由
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Named outlets are the targets of  _secondary routes_.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								命名出口是*第二路由*的目标。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Secondary routes look like primary routes and you configure them the same way.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								They differ in a few key respects.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								第二路由很像主路由，配置方式也一样。它们只有一些关键的不同点：
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* They are independent of each other.
-												feat: add auto checker
fix: some translations found by auto checker

											
										
										
											2018-03-01 22:19:59 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   它们彼此互不依赖。
 								* They work in combination with other routes.
 								   它们与其它路由组合使用。
-												feat: add auto checker
fix: some translations found by auto checker

											
										
										
											2018-03-01 22:19:59 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* They are displayed in named outlets.
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   它们显示在命名出口中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Generate a new component to compose the message.
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								生成一个新的组件来组合这个消息。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng generate component compose-message
 								</code-example>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								It displays a simple form with a header, an input box for the message,
 								and two buttons, "Send" and "Cancel".
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								它显示一个简单的表单，包括一个头、一个消息输入框和两个按钮：“Send”和“Cancel”。
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								<div class="lightbox">
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								  <img src='generated/images/guide/router/contact-popup.png' alt="Contact popup">
-												feat(docs-infra): simplify image styles and remove figure references (#33748)

Reference #33259
Removes figures elements as AIO is not typically using captions or image groups where figures would be necessary or appropriate

PR Close #33748

											
										
										
											2019-11-11 14:47:51 -08:00
+								</div>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Here's the component, its template and styles:
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								下面是该组件及其模板和样式：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								<code-tabs>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="src/app/compose-message/compose-message.component.css" path="router/src/app/compose-message/compose-message.component.css">
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
 								  </code-pane>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="src/app/compose-message/compose-message.component.html" path="router/src/app/compose-message/compose-message.component.html">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								  </code-pane>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="src/app/compose-message/compose-message.component.ts" path="router/src/app/compose-message/compose-message.component.ts">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								</code-tabs>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
 								It looks about the same as any other component you've seen in this guide.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								There are two noteworthy differences.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								它看起来几乎和你以前见过其它组件一样，但有两个值得注意的区别。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Note that the `send()` method simulates latency by waiting a second before "sending" the message and closing the popup.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 精修翻译

											
										
										
											2019-02-02 02:29:31 +08:00
+								注意，`send()` 方法在发送消息和关闭弹出框之前通过等待模拟了一秒钟的延迟。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								The `closePopup()` method closes the popup view by navigating to the popup outlet with a `null`.
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								That's a peculiarity covered [below](#clear-secondary-routes).
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`closePopup()` 方法用把 `popup` 出口导航到 `null` 的方式关闭了弹出框。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								这个奇怪的用法在[稍后的部分](guide/router#clear-secondary-routes)有讲解。
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a add-secondary-route}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								#### Add a secondary route
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								#### 添加第二路由
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								Open the `AppRoutingModule` and add a new `compose` route to the `appRoutes`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								打开 `AppRoutingModule`，并把一个新的 `compose` 路由添加到 `appRoutes` 中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	.nvmrc
#	aio/content/cli/index.md
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/app-shell.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bazel.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/build.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/cli-builder.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/complex-animation-sequences.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/creating-libraries.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-navtree.md
#	aio/content/guide/dependency-injection-providers.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/deprecations.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/dynamic-form.md
#	aio/content/guide/elements.md
#	aio/content/guide/entry-components.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/file-structure.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms-overview.md
#	aio/content/guide/forms.md
#	aio/content/guide/frequent-ngmodules.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/ivy.md
#	aio/content/guide/language-service.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/module-types.md
#	aio/content/guide/ngmodule-api.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/providers.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/releases.md
#	aio/content/guide/reusable-animations.md
#	aio/content/guide/route-animations.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/schematics-authoring.md
#	aio/content/guide/schematics-for-libraries.md
#	aio/content/guide/schematics.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-devops.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-local.md
#	aio/content/guide/sharing-ngmodules.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/static-query-migration.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/transition-and-triggers.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade-setup.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/using-libraries.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/web-worker.md
#	aio/content/guide/workspace-config.md
#	aio/content/marketing/events.html
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/content/start/data.md
#	aio/content/start/deployment.md
#	aio/content/start/forms.md
#	aio/content/start/index.md
#	aio/content/start/routing.md
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/app/app.component.spec.ts
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/app/layout/mode-banner/mode-banner.component.ts
#	aio/src/app/layout/nav-item/nav-item.component.html
#	aio/src/app/shared/toc.service.ts
#	aio/src/styles/0-base/_typography.scss
#	aio/src/styles/2-modules/_api-pages.scss
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/yarn.lock
#	packages/common/http/src/headers.ts
#	packages/common/http/src/interceptor.ts
#	packages/common/http/src/params.ts
#	packages/common/http/src/response.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/date_pipe.ts
#	packages/core/src/change_detection/pipe_transform.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/directives.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render3/component_ref.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/form_builder.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/directives/router_outlet.ts
#	packages/router/src/events.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts
#	packages/router/src/shared.ts

											
										
										
											2020-01-11 18:10:12 +08:00
+								<code-example path="router/src/app/app-routing.module.3.ts" header="src/app/app-routing.module.ts (compose route)" region="compose"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								The `path` and `component` properties should be familiar.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								There's a new property, `outlet`, set to `'popup'`.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								This route now targets the popup outlet and the `ComposeMessageComponent` will display there.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								对 `path` 和 `component` 属性应该很熟悉了吧。
 								注意这个新的属性 `outlet` 被设置成了 `'popup'`。
 								这个路由现在指向了 `popup` 出口，而 `ComposeMessageComponent` 也将显示在那里。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The user needs a way to open the popup.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								Open the `AppComponent` and add a "Contact" link.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								用户需要某种途径来打开这个弹出框。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								打开 `AppComponent`，并添加一个“Contact”链接。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	.nvmrc
#	aio/content/cli/index.md
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/app-shell.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bazel.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/build.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/cli-builder.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/complex-animation-sequences.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/creating-libraries.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-navtree.md
#	aio/content/guide/dependency-injection-providers.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/deprecations.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/dynamic-form.md
#	aio/content/guide/elements.md
#	aio/content/guide/entry-components.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/file-structure.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms-overview.md
#	aio/content/guide/forms.md
#	aio/content/guide/frequent-ngmodules.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/ivy.md
#	aio/content/guide/language-service.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/module-types.md
#	aio/content/guide/ngmodule-api.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/providers.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/releases.md
#	aio/content/guide/reusable-animations.md
#	aio/content/guide/route-animations.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/schematics-authoring.md
#	aio/content/guide/schematics-for-libraries.md
#	aio/content/guide/schematics.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-devops.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-local.md
#	aio/content/guide/sharing-ngmodules.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/static-query-migration.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/transition-and-triggers.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade-setup.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/using-libraries.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/web-worker.md
#	aio/content/guide/workspace-config.md
#	aio/content/marketing/events.html
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/content/start/data.md
#	aio/content/start/deployment.md
#	aio/content/start/forms.md
#	aio/content/start/index.md
#	aio/content/start/routing.md
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/app/app.component.spec.ts
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/app/layout/mode-banner/mode-banner.component.ts
#	aio/src/app/layout/nav-item/nav-item.component.html
#	aio/src/app/shared/toc.service.ts
#	aio/src/styles/0-base/_typography.scss
#	aio/src/styles/2-modules/_api-pages.scss
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/yarn.lock
#	packages/common/http/src/headers.ts
#	packages/common/http/src/interceptor.ts
#	packages/common/http/src/params.ts
#	packages/common/http/src/response.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/date_pipe.ts
#	packages/core/src/change_detection/pipe_transform.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/directives.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render3/component_ref.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/form_builder.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/directives/router_outlet.ts
#	packages/router/src/events.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts
#	packages/router/src/shared.ts

											
										
										
											2020-01-11 18:10:12 +08:00
+								<code-example path="router/src/app/app.component.4.html" header="src/app/app.component.html (contact-link)" region="contact-link"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								Although the `compose` route is pinned to the "popup" outlet, that's not sufficient for wiring the route to a `RouterLink` directive.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You have to specify the named outlet in a _link parameters array_ and bind it to the `RouterLink` with a property binding.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								虽然 `compose` 路由被钉死在了 `popup` 出口上，但这仍然不足以向 `RouterLink` 指令表明要加载该路由。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你还要在*链接参数数组*中指定这个命名出口，并通过属性绑定的形式把它绑定到 `RouterLink` 上。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The _link parameters array_ contains an object with a single `outlets` property whose value
 								is another object keyed by one (or more) outlet names.
 								In this case there is only the "popup" outlet property and its value is another _link parameters array_ that specifies the `compose` route.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								*链接参数数组*包含一个只有一个 `outlets` 属性的对象，它的值是另一个对象，这个对象以一个或多个路由的出口名作为属性名。
 								在这里，它只有一个出口名“popup”，它的值则是另一个*链接参数数组*，用于指定 `compose` 路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You are in effect saying, _when the user clicks this link, display the component associated with the `compose` route in the `popup` outlet_.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								意思是，当用户点击此链接时，在路由出口 `popup` 中显示与 `compose` 路由相关联的组件。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								This `outlets` object within an outer object was completely unnecessary
 								when there was only one route and one _unnamed_ outlet to think about.
-												fix: 精修翻译

											
										
										
											2019-02-02 02:29:31 +08:00
+								当只需要考虑一个路由和一个*无名*出口时，外部对象中的这个 `outlets` 对象是完全不必要的。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The router assumed that your route specification targeted the _unnamed_ primary outlet
 								and created these objects for you.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								路由器假设这个路由指向了*无名*的主出口，并为你创建这些对象。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Routing to a named outlet has revealed a previously hidden router truth:
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								you can target multiple outlets with multiple routes in the same `RouterLink` directive.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								路由到一个命名出口就会揭示一个以前被隐藏的真相：
 								你可以在同一个 `RouterLink` 指令中为多个路由出口指定多个路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								You're not actually doing that here.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								But to target a named outlet, you must use the richer, more verbose syntax.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								这里你实际上没能这样做。要想指向命名出口，你就得使用一种更强大也更啰嗦的语法。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a secondary-route-navigation}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								#### Secondary route navigation: merging routes during navigation
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
 								#### 第二路由导航：在导航期间合并路由
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Navigate to the _Crisis Center_ and click "Contact".
 								you should see something like the following URL in the browser address bar.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								导航到*危机中心*并点击“Contact”，你将会在浏览器的地址栏看到如下 URL：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								<code-example>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
+								  http://.../crisis-center(popup:compose)
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								</code-example>
 								The interesting part of the URL follows the `...`:
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								这个 URL 中有意思的部分是 `...` 后面的这些：
-												fix: 不正常的中英文段落合并

											
										
										
											2018-02-28 13:43:40 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								* The `crisis-center` is the primary navigation.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   `crisis-center` 是主导航。
-												fix: 不正常的中英文段落合并

											
										
										
											2018-02-28 13:43:40 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* Parentheses surround the secondary route.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   圆括号包裹的部分是第二路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* The secondary route consists of an outlet name (`popup`), a `colon` separator, and the secondary route path (`compose`).
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   第二路由包括一个出口名称（`popup`）、一个冒号分隔符和第二路由的路径（`compose`）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Click the _Heroes_ link and look at the URL again.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:15:36 +08:00
+								点击 *Heroes* 链接，并再次查看 URL：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								<code-example>
 								  http://.../heroes(popup:compose)
 								</code-example>
 								The primary navigation part has changed; the secondary route is the same.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								主导航的部分变化了，而第二路由没有变。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The router is keeping track of two separate branches in a navigation tree and generating a representation of that tree in the URL.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								路由器在导航树中对两个独立的分支保持追踪，并在 URL 中对这棵树进行表达。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You can add many more outlets and routes, at the top level and in nested levels, creating a navigation tree with many branches.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								The router will generate the URL to go with it.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你还可以添加更多出口和更多路由（无论是在顶层还是在嵌套的子层）来创建一个带有多个分支的导航树。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								路由器将会生成相应的 URL。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You can tell the router to navigate an entire tree at once by filling out the `outlets` object mentioned above.
 								Then pass that object inside a _link parameters array_  to the `router.navigate` method.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								通过像前面那样填充 `outlets` 对象，你可以告诉路由器立即导航到一棵完整的树。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								然后把这个对象通过一个*链接参数数组*传给 `router.navigate` 方法。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Experiment with these possibilities at your leisure.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								有空的时候你可以自行试验这些可能性。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a clear-secondary-routes}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								#### Clearing secondary routes
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
 								#### 清除第二路由
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								As you've learned, a component in an outlet persists until you navigate away to a new component.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Secondary outlets are no different in this regard.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								正如你刚刚学到的，除非导航到新的组件，否则路由出口中的组件会始终存在。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								这里涉及到的第二出口也同样如此。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Each secondary outlet has its own navigation, independent of the navigation driving the primary outlet.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Changing a current route that displays in the primary outlet has no effect on the popup outlet.
 								That's why the popup stays visible as you navigate among the crises and heroes.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								每个第二出口都有自己独立的导航，跟主出口的导航彼此独立。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								修改主出口中的当前路由并不会影响到 `popup` 出口中的。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								这就是为什么在危机中心和英雄管理之间导航时，弹出框始终都是可见的。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Clicking the "send" or "cancel" buttons _does_ clear the popup view.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								To see how, look at the `closePopup()` method again:
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								点击“send”或“cancel”按钮，则*会*清除弹出框视图。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								为何如此？再看看 `closePopup()` 方法：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	.nvmrc
#	aio/content/cli/index.md
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/app-shell.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bazel.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/build.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/cli-builder.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/complex-animation-sequences.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/creating-libraries.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-navtree.md
#	aio/content/guide/dependency-injection-providers.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/deprecations.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/dynamic-form.md
#	aio/content/guide/elements.md
#	aio/content/guide/entry-components.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/file-structure.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms-overview.md
#	aio/content/guide/forms.md
#	aio/content/guide/frequent-ngmodules.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/ivy.md
#	aio/content/guide/language-service.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/module-types.md
#	aio/content/guide/ngmodule-api.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/providers.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/releases.md
#	aio/content/guide/reusable-animations.md
#	aio/content/guide/route-animations.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/schematics-authoring.md
#	aio/content/guide/schematics-for-libraries.md
#	aio/content/guide/schematics.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-devops.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-local.md
#	aio/content/guide/sharing-ngmodules.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/static-query-migration.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/transition-and-triggers.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade-setup.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/using-libraries.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/web-worker.md
#	aio/content/guide/workspace-config.md
#	aio/content/marketing/events.html
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/content/start/data.md
#	aio/content/start/deployment.md
#	aio/content/start/forms.md
#	aio/content/start/index.md
#	aio/content/start/routing.md
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/app/app.component.spec.ts
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/app/layout/mode-banner/mode-banner.component.ts
#	aio/src/app/layout/nav-item/nav-item.component.html
#	aio/src/app/shared/toc.service.ts
#	aio/src/styles/0-base/_typography.scss
#	aio/src/styles/2-modules/_api-pages.scss
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/yarn.lock
#	packages/common/http/src/headers.ts
#	packages/common/http/src/interceptor.ts
#	packages/common/http/src/params.ts
#	packages/common/http/src/response.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/date_pipe.ts
#	packages/core/src/change_detection/pipe_transform.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/directives.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render3/component_ref.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/form_builder.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/directives/router_outlet.ts
#	packages/router/src/events.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts
#	packages/router/src/shared.ts

											
										
										
											2020-01-11 18:10:12 +08:00
+								<code-example path="router/src/app/compose-message/compose-message.component.ts" header="src/app/compose-message/compose-message.component.ts (closePopup)" region="closePopup"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								It navigates imperatively with the `Router.navigate()` method, passing in a [link parameters array](#link-parameters-array).
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								它使用 `Router.navigate()` 方法进行强制导航，并传入了一个[链接参数数组](guide/router#link-parameters-array)。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Like the array bound to the _Contact_ `RouterLink` in the `AppComponent`,
 								this one includes an object with an `outlets` property.
 								The `outlets` property value is another object with outlet names for keys.
 								The only named outlet is `'popup'`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:15:36 +08:00
+								就像在 `AppComponent` 中绑定到的 *Contact* `RouterLink` 一样，它也包含了一个带 `outlets` 属性的对象。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`outlets` 属性的值是另一个对象，该对象用一些出口名称作为属性名。
 								唯一的命名出口是 `'popup'`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								This time, the value of `'popup'` is `null`. That's not a route, but it is a legitimate value.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Setting the popup `RouterOutlet` to `null` clears the outlet and removes
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								the secondary popup route from the current URL.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								但这次，`'popup'` 的值是 `null`。`null` 不是一个路由，但却是一个合法的值。
 								把 `popup` 这个 `RouterOutlet` 设置为 `null` 会清除该出口，并且从当前 URL 中移除第二路由 `popup`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): fix lots of broken links

Closes #16317

											
										
										
											2017-04-30 22:10:32 +02:00
+								{@a guards}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								## Milestone 5: Route guards
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								## 里程碑 5：路由守卫
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								At the moment, *any* user can navigate *anywhere* in the application *anytime*.
 								That's not always the right thing to do.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								现在，*任何用户*都能在*任何时候*导航到*任何地方*。
 								但有时候这样是不对的。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* Perhaps the user is not authorized to navigate to the target component.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   该用户可能无权导航到目标组件。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* Maybe the user must login (*authenticate*) first.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   可能用户得先登录（认证）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* Maybe you should fetch some data before you display the target component.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								   在显示目标组件前，你可能得先获取某些数据。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* You might want to save pending changes before leaving a component.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								   在离开组件前，你可能要先保存修改。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* You might ask the user if it's OK to discard pending changes rather than save them.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								   你可能要询问用户：你是否要放弃本次更改，而不用保存它们？
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								You add _guards_ to the route configuration to handle these scenarios.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你可以往路由配置中添加***守卫***，来处理这些场景。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								A guard's return value controls the router's behavior:
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								守卫返回一个值，以控制路由器的行为：
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* If it returns `true`, the navigation process continues.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   如果它返回 `true`，导航过程会继续
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* If it returns `false`, the navigation process stops and the user stays put.
-												fix: 翻译遗漏的内容

											
										
										
											2019-01-04 15:43:45 +08:00
 								   如果它返回 `false`，导航过程就会终止，且用户留在原地。
-												feat(router): guard returning UrlTree cancels current navigation and redirects (#26521)

Fixes #24618
FW-153 #resolve

PR Close #26521

											
										
										
											2018-10-17 09:30:45 -07:00
+								* If it returns a `UrlTree`, the current navigation cancels and a new navigation is initiated to the `UrlTree` returned.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 翻译遗漏的内容

											
										
										
											2019-01-04 15:43:45 +08:00
+								  如果它返回 `UrlTree`，则取消当前的导航，并且开始导航到返回的这个 `UrlTree`.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/api-page-class.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/elements.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/frequent-ngmodules.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/language-service.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-api.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/releases.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing-observables.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/webpack.md
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/app/custom-elements/live-example/live-example.component.html
#	aio/src/app/custom-elements/live-example/live-example.component.ts
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/styles/main.scss
#	aio/tools/transforms/remark-package/services/renderMarkdown.js

											
										
										
											2018-07-27 10:51:18 +08:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 修订合并冲突

											
										
										
											2019-06-07 13:37:23 +08:00
+								**Note:** The guard can also tell the router to navigate elsewhere, effectively canceling the current navigation. When
-												feat(router): guard returning UrlTree cancels current navigation and redirects (#26521)

Fixes #24618
FW-153 #resolve

PR Close #26521

											
										
										
											2018-10-17 09:30:45 -07:00
+								doing so inside a guard, the guard should return `false`;
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 修复一些翻译错误

											
										
										
											2019-01-26 23:44:04 +08:00
+								**注意**：守卫还可以告诉路由器导航到别处，这样也会取消当前的导航。要想在守卫中这么做，就要返回 `false`；
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The guard *might* return its boolean answer synchronously.
 								But in many cases, the guard can't produce an answer synchronously.
 								The guard could ask the user a question, save changes to the server, or fetch fresh data.
 								These are all asynchronous operations.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								守卫*可以*用同步的方式返回一个布尔值。但在很多情况下，守卫无法用同步的方式给出答案。
 								守卫可能会向用户问一个问题、把更改保存到服务器，或者获取新数据，而这些都是异步操作。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Accordingly, a routing guard can return an `Observable<boolean>` or a `Promise<boolean>` and the
 								router will wait for the observable to resolve to `true` or `false`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								因此，路由的守卫可以返回一个 `Observable<boolean>` 或 `Promise<boolean>`，并且路由器会等待这个可观察对象被解析为 `true` 或 `false`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								<div class="alert is-critical">
 								**Note:** The observable provided to the Router _must_ also complete. If the observable does not complete, the navigation will not continue.
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								**注意：** 提供给路由器的可观察对象还*必须*能结束（complete）。否则，导航就不会继续。
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								</div>
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								The router supports multiple guard interfaces:
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 翻译《路由与导航》中遗漏的部分
fix: 把 header 修复成双行对照的格式

											
										
										
											2018-03-14 09:13:52 +08:00
+								路由器可以支持多种守卫接口：
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								* [`CanActivate`](api/router/CanActivate) to mediate navigation *to* a route.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   用[`CanActivate`](api/router/CanActivate)来处理导航*到*某路由的情况。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								* [`CanActivateChild`](api/router/CanActivateChild) to mediate navigation *to* a child route.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   用[`CanActivateChild`](api/router/CanActivateChild)来处理导航*到*某子路由的情况。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								* [`CanDeactivate`](api/router/CanDeactivate) to mediate navigation *away* from the current route.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   用[`CanDeactivate`](api/router/CanDeactivate)来处理从当前路由*离开*的情况.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								* [`Resolve`](api/router/Resolve) to perform route data retrieval *before* route activation.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   用[`Resolve`](api/router/Resolve)在路由激活*之前*获取路由数据。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								* [`CanLoad`](api/router/CanLoad) to mediate navigation *to* a feature module loaded _asynchronously_.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cb-index.md
#	aio/content/guide/change-log.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/cli-quickstart.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/dynamic-form.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/index.md
#	aio/content/guide/learning-angular.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/pipes.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/security.md
#	aio/content/guide/server-communication.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/ts-to-js.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/webpack.md
#	aio/content/navigation.json
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/styles/main.scss
#	aio/transforms/angular.io-package/index.js

											
										
										
											2017-07-30 00:03:22 +08:00
+								   用[`CanLoad`](api/router/CanLoad)来处理*异步*导航到某特性模块的情况。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You can have multiple guards at every level of a routing hierarchy.
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								The router checks the `CanDeactivate` and `CanActivateChild` guards first, from the deepest child route to the top.
 								Then it checks the `CanActivate` guards from the top down to the deepest child route. If the feature module
 								is loaded asynchronously, the `CanLoad` guard is checked before the module is loaded.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								If _any_ guard returns false, pending guards that have not completed will be canceled,
 								and the entire navigation is canceled.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在分层路由的每个级别上，你都可以设置多个守卫。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								路由器会先按照从最深的子路由由下往上检查的顺序来检查 `CanDeactivate()` 和 `CanActivateChild()` 守卫。
 								然后它会按照从上到下的顺序检查 `CanActivate()` 守卫。
 								如果特性模块是异步加载的，在加载它之前还会检查 `CanLoad()` 守卫。
 								如果*任何*一个守卫返回 `false`，其它尚未完成的守卫会被取消，这样整个导航就被取消了。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								There are several examples over the next few sections.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								接下来的小节中有一些例子。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a can-activate-guard}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								### _CanActivate_: requiring authentication
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### *CanActivate*: 要求认证
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Applications often restrict access to a feature area based on who the user is.
 								You could permit access only to authenticated users or to users with a specific role.
 								You might block or limit access until the user's account is activated.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								应用程序通常会根据访问者来决定是否授予某个特性区的访问权。
-												fix: 把遗漏的 我们 替换成 你

											
										
										
											2018-03-23 09:43:02 +08:00
+								你可以只对已认证过的用户或具有特定角色的用户授予访问权，还可以阻止或限制用户访问权，直到用户账户激活为止。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `CanActivate` guard is the tool to manage these navigation business rules.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`CanActivate` 守卫是一个管理这些导航类业务规则的工具。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								#### Add an admin feature module
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								#### 添加一个“管理”特性模块
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								In this next section, you'll extend the crisis center with some new *administrative* features.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Those features aren't defined yet.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								But you can start by adding a new feature module named `AdminModule`.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在下一节，你将会使用一些新的*管理*特性来扩展危机中心。
 								那些特性尚未定义，但是你可以先从添加一个名叫 `AdminModule` 的特性模块开始。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Generate an `admin` folder with a feature module file and a routing configuration file.
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								生成一个带有特性模块文件和路由配置文件的 `admin` 目录。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng generate module admin --routing
 								</code-example>
 								Next, generate the supporting components.
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								接下来，生成一些支持性组件。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng generate component admin/admin-dashboard
 								</code-example>
 								<code-example language="none" class="code-shell">
 								  ng generate component admin/admin
 								</code-example>
 								<code-example language="none" class="code-shell">
 								  ng generate component admin/manage-crises
 								</code-example>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng generate component admin/manage-heroes
 								</code-example>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The admin feature file structure looks like this:
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								管理特性区的文件是这样的：
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								<div class='filetree'>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								  <div class='file'>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								    src/app/admin
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								  </div>
 								  <div class='children'>
 								    <div class='file'>
-												fix: 修订合并冲突

											
										
										
											2019-06-07 13:37:23 +08:00
+								      admin
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      <div class='children'>
 								        <div class='file'>
 								          admin.component.css
 								        </div>
 								        <div class='file'>
 								          admin.component.html
 								        </div>
 								        <div class='file'>
 								          admin.component.ts
 								        </div>
 								      </div>
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    <div class='file'>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      admin-dashboard
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      <div class='children'>
 								        <div class='file'>
 								          admin-dashboard.component.css
 								        </div>
 								        <div class='file'>
 								          admin-dashboard.component.html
 								        </div>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												fix: 修订合并冲突

											
										
										
											2019-06-07 13:37:23 +08:00
+								        <div class='file'>
 								          admin-dashboard.component.ts
 								        </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      </div>
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    <div class='file'>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      manage-crises
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      <div class='children'>
 								        <div class='file'>
-												fix: 修订合并冲突

											
										
										
											2019-06-07 13:37:23 +08:00
+								          manage-crises.component.css
 								        </div>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												fix: 修订合并冲突

											
										
										
											2019-06-07 13:37:23 +08:00
+								        <div class='file'>
 								          manage-crises.component.html
 								        </div>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												fix: 修订合并冲突

											
										
										
											2019-06-07 13:37:23 +08:00
+								        <div class='file'>
 								          manage-crises.component.ts
 								        </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      </div>
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    <div class='file'>
-												fix: 修订合并冲突

											
										
										
											2019-06-07 13:37:23 +08:00
+								      manage-heroes
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      <div class='children'>
 								        <div class='file'>
 								          manage-heroes.component.css
 								        </div>
 								        <div class='file'>
 								          manage-heroes.component.html
 								        </div>
 								        <div class='file'>
 								          manage-heroes.component.ts
 								        </div>
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      </div>
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    <div class='file'>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      admin.module.ts
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    <div class='file'>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								      admin-routing.module.ts
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								    </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								  </div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): revert file-trees back to original structure

This is an auto-migration from angular.io

											
										
										
											2017-04-11 21:44:52 +01:00
+								</div>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
 								The admin feature module contains the `AdminComponent` used for routing within the
 								feature module, a dashboard route and two unfinished components to manage crises and heroes.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								管理特性模块包含 `AdminComponent`，它用于在特性模块内的仪表盘路由以及两个尚未完成的用于管理危机和英雄的组件之间进行路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								<code-tabs>
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								  <code-pane header="src/app/admin/admin/admin.component.html"  path="router/src/app/admin/admin/admin.component.html">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								  </code-pane>
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								  <code-pane header="src/app/admin/admin-dashboard/admin-dashboard.component.html" path="router/src/app/admin/admin-dashboard/admin-dashboard.component.1.html">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								  </code-pane>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="src/app/admin/admin.module.ts" path="router/src/app/admin/admin.module.ts">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								  <code-pane header="src/app/admin/manage-crises/manage-crises.component.html" path="router/src/app/admin/manage-crises/manage-crises.component.html">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								  <code-pane header="src/app/admin/manage-heroes/manage-heroes.component.html"  path="router/src/app/admin/manage-heroes/manage-heroes.component.html">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								</code-tabs>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								Although the admin dashboard `RouterLink` only contains a relative slash without an additional URL segment, it
 								is considered a match to any route within the admin feature area. You only want the `Dashboard` link to be active when the user visits that route. Adding an additional binding to the `Dashboard` routerLink,`[routerLinkActiveOptions]="{ exact: true }"`, marks the `./` link as active when the user navigates to the `/admin` URL and not when navigating to any of the child routes.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								虽然管理仪表盘中的 `RouterLink` 只包含一个没有其它 URL 段的斜杠 `/`，但它能匹配管理特性区下的任何路由。
 								但你只希望在访问 `Dashboard` 路由时才激活该链接。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								往 `Dashboard` 这个 routerLink 上添加另一个绑定 `[routerLinkActiveOptions]="{ exact: true }"`，
 								这样就只有当用户导航到 `/admin` 这个 URL 时才会激活它，而不会在导航到它的某个子路由时。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								{@a component-less-route}
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								##### Component-less route: grouping routes without a component
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								##### 无组件路由：分组路由，而不需要组件
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The initial admin routing configuration:
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								最初的管理路由配置如下：
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/admin/admin-routing.module.1.ts" header="src/app/admin/admin-routing.module.ts (admin routing)" region="admin-routes"></code-example>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Looking at the child route under the `AdminComponent`, there is a `path` and a `children`
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								property but it's not using a `component`.
 								You haven't made a mistake in the configuration.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You've defined a _component-less_ route.
-												fix: 把遗漏的 我们 替换成 你

											
										
										
											2018-03-23 09:43:02 +08:00
+								来看 `AdminComponent` 下的子路由，这里有一个带 **path** 和 **children** 的子路由，
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:15:36 +08:00
+								但它没有使用 **component**。这并不是配置中的失误，而是在使用**无组件**路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The goal is to group the `Crisis Center` management routes under the `admin` path.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								You don't need a component to do it.
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								A _component-less_ route makes it easier to [guard child routes](#can-activate-child-guard).
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								这里的目标是对 `admin` 路径下的 ` 危机中心 ` 管理类路由进行分组，但并不需要另一个仅用来分组路由的组件。
 								一个*无组件*的路由能让[守卫子路由](guide/router#can-activate-child-guard)变得更容易。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Next, import the `AdminModule` into `app.module.ts` and add it to the `imports` array
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								to register the admin routes.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								接下来，把 `AdminModule` 导入到 `app.module.ts` 中，并把它加入 `imports` 数组中来注册这些管理类路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.module.4.ts" header="src/app/app.module.ts (admin module)" region="admin-module"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Add an "Admin" link to the `AppComponent` shell so that users can get to this feature.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								然后往壳组件 `AppComponent` 中添加一个链接，让用户能点击它，以访问该特性。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.component.5.html" header="src/app/app.component.html (template)"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a guard-admin-feature}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								#### Guard the admin feature
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								#### 守护“管理特性”区
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Currently every route within the *Crisis Center* is open to everyone.
 								The new *admin* feature should be accessible only to authenticated users.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								现在“危机中心”的每个路由都是对所有人开放的。这些新的*管理特性*应该只能被已登录用户访问。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You could hide the link until the user logs in. But that's tricky and difficult to maintain.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你可以在用户登录之前隐藏这些链接，但这样会有点复杂并难以维护。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								Instead you'll write a `canActivate()` guard method to redirect anonymous users to the
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								login page when they try to enter the admin area.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你可以换种方式：写一个 `CanActivate()` 守卫，将正在尝试访问管理组件匿名用户重定向到登录页。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								This is a general purpose guard&mdash;you can imagine other features
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								that require authenticated users&mdash;so you generate an
 								`AuthGuard` in the `auth` folder.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								这是一个通用的守卫（你可以假设另外一些特性区也要求已认证过的用户才能访问），所以你可以在 `auth` 目录下生成一个 `AuthGuard`。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng generate guard auth/auth
 								</code-example>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
 								At the moment you're interested in seeing how guards work so the first version does nothing useful.
 								It simply logs to console and `returns` true immediately, allowing navigation to proceed:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								此刻，你的兴趣在于看看守卫是如何工作的，所以第一个版本没做什么有用的事情。它只是往控制台写日志，并且立即返回 `true`，让导航继续：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/auth/auth.guard.1.ts" header="src/app/auth/auth.guard.ts (excerpt)"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Next, open `admin-routing.module.ts `, import the `AuthGuard` class, and
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								update the admin route with a `canActivate` guard property that references it:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 修改翻译错误

原文与翻译内容不一致，admin-routing.module.ts 写成了 crisis-center.routes.ts
											
										
										
											2019-08-06 11:44:07 +08:00
+								接下来，打开 `admin-routing.module.ts`，导入 `AuthGuard` 类，修改管理路由并通过 `CanActivate()` 守卫来引用 `AuthGuard`：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/admin/admin-routing.module.2.ts" header="src/app/admin/admin-routing.module.ts (guarded admin route)" region="admin-route"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												fix: 移除纯粹由空格组成的行，它会导致错误的 markdown 编译

											
										
										
											2019-01-01 22:17:43 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The admin feature is now protected by the guard, albeit protected poorly.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								管理特性区现在受此守卫保护了，不过这样的保护还不够。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a teach-auth}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								#### Teach *AuthGuard* to authenticate
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:15:36 +08:00
+								#### 教 *AuthGuard* 进行认证
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Make the `AuthGuard` at least pretend to authenticate.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								先让 `AuthGuard` 至少能“假装”进行认证。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(router): fix misnamed path (#27879)

This change matches the routes found in the following code example
for auth.guard.ts as well as the login.component.1.ts in the "Add
the LoginComponent" section.

PR Close #27879

											
										
										
											2018-12-31 23:09:14 -05:00
+								The `AuthGuard` should call an application service that can login a user and retain information about the current user. Generate a new `AuthService` in the `auth` folder:
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								`AuthGuard` 可以调用应用中的一项服务，该服务能让用户登录，并且保存当前用户的信息。在 `admin` 目录下生成一个新的 `AuthService`：
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
-												docs(router): fix misnamed path (#27879)

This change matches the routes found in the following code example
for auth.guard.ts as well as the login.component.1.ts in the "Add
the LoginComponent" section.

PR Close #27879

											
										
										
											2018-12-31 23:09:14 -05:00
+								  ng generate service auth/auth
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								</code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Update the `AuthService` to log in the user:
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 翻译遗漏的内容

											
										
										
											2019-01-04 15:43:45 +08:00
+								修改 `AuthService` 以登入此用户：
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	.nvmrc
#	aio/content/cli/index.md
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/app-shell.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bazel.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/build.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/cli-builder.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/complex-animation-sequences.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/creating-libraries.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-navtree.md
#	aio/content/guide/dependency-injection-providers.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/deprecations.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/dynamic-form.md
#	aio/content/guide/elements.md
#	aio/content/guide/entry-components.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/file-structure.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms-overview.md
#	aio/content/guide/forms.md
#	aio/content/guide/frequent-ngmodules.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/ivy.md
#	aio/content/guide/language-service.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/module-types.md
#	aio/content/guide/ngmodule-api.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/providers.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/releases.md
#	aio/content/guide/reusable-animations.md
#	aio/content/guide/route-animations.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/schematics-authoring.md
#	aio/content/guide/schematics-for-libraries.md
#	aio/content/guide/schematics.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-devops.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-local.md
#	aio/content/guide/sharing-ngmodules.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/static-query-migration.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/transition-and-triggers.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade-setup.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/using-libraries.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/web-worker.md
#	aio/content/guide/workspace-config.md
#	aio/content/marketing/events.html
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/content/start/data.md
#	aio/content/start/deployment.md
#	aio/content/start/forms.md
#	aio/content/start/index.md
#	aio/content/start/routing.md
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/app/app.component.spec.ts
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/app/layout/mode-banner/mode-banner.component.ts
#	aio/src/app/layout/nav-item/nav-item.component.html
#	aio/src/app/shared/toc.service.ts
#	aio/src/styles/0-base/_typography.scss
#	aio/src/styles/2-modules/_api-pages.scss
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/yarn.lock
#	packages/common/http/src/headers.ts
#	packages/common/http/src/interceptor.ts
#	packages/common/http/src/params.ts
#	packages/common/http/src/response.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/date_pipe.ts
#	packages/core/src/change_detection/pipe_transform.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/directives.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render3/component_ref.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/form_builder.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/directives/router_outlet.ts
#	packages/router/src/events.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts
#	packages/router/src/shared.ts

											
										
										
											2020-01-11 18:10:12 +08:00
+								<code-example path="router/src/app/auth/auth.service.ts" header="src/app/auth/auth.service.ts (excerpt)"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Although it doesn't actually log in, it has what you need for this discussion.
 								It has an `isLoggedIn` flag to tell you whether the user is authenticated.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Its `login` method simulates an API call to an external service by returning an
-												fix: sync to 6.0(WIP)

											
										
										
											2018-05-10 13:55:06 +08:00
+								observable that resolves successfully after a short pause.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `redirectUrl` property will store the attempted URL so you can navigate to it after authenticating.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								虽然它不会真的进行登录，但足够让你进行这个讨论了。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								它有一个 `isLoggedIn` 标志，用来标识是否用户已经登录过了。
 								它的 `login` 方法会仿真一个对外部服务的 API 调用，返回一个可观察对象（observable）。在短暂的停顿之后，这个可观察对象就会解析成功。
 								`redirectUrl` 属性将会保存在 URL 中，以便认证完之后导航到它。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Revise the `AuthGuard` to call it.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								这就修改 `AuthGuard` 来调用它。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/auth/auth.guard.2.ts" header="src/app/auth/auth.guard.ts (v2)"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Notice that you *inject* the `AuthService` and the `Router` in the constructor.
 								You haven't provided the `AuthService` yet but it's good to know that you can inject helpful services into routing guards.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								注意，你把 `AuthService` 和 `Router` 服务*注入到*构造函数中。
 								你还没有提供 `AuthService`，这里要说明的是：可以往路由守卫中注入有用的服务。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								This guard returns a synchronous boolean result.
 								If the user is logged in, it returns true and the navigation continues.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								该守卫返回一个同步的布尔值。如果用户已经登录，它就返回 `true`，导航会继续。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `ActivatedRouteSnapshot` contains the _future_ route that will be activated and the `RouterStateSnapshot`
 								contains the _future_ `RouterState` of the application, should you pass through the guard check.
-												fix: 把中文中的_替换成*

											
										
										
											2018-03-22 17:24:05 +08:00
+								这个 `ActivatedRouteSnapshot` 包含了*即将*被激活的路由，而 `RouterStateSnapshot` 包含了该应用*即将*到达的状态。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你应该通过守卫进行检查。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								If the user is not logged in, you store the attempted URL the user came from using the `RouterStateSnapshot.url` and
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								tell the router to navigate to a login page&mdash;a page you haven't created yet.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								This secondary navigation automatically cancels the current navigation; `checkLogin()` returns
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								`false` just to be clear about that.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								如果用户还没有登录，你就会用 `RouterStateSnapshot.url` 保存用户来自的 URL 并让路由器导航到登录页（你尚未创建该页）。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								这间接导致路由器自动中止了这次导航，`checkLogin()` 返回 `false` 并不是必须的，但这样可以更清楚的表达意图。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a add-login-component}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								#### Add the *LoginComponent*
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:15:36 +08:00
+								#### 添加 *LoginComponent*
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You need a `LoginComponent` for the user to log in to the app. After logging in, you'll redirect
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								to the stored URL if available, or use the default URL.
 								There is nothing new about this component or the way you wire it into the router configuration.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你需要一个 `LoginComponent` 来让用户登录进这个应用。在登录之后，你就会跳转到前面保存的 URL，如果没有，就跳转到默认 URL。
 								  该组件没有什么新内容，你把它放进路由配置的方式也没什么新意。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng generate component auth/login
 								</code-example>
 								Register a `/login` route in the `auth/auth-routing.module.ts`. In `app.module.ts`, import and add the `AuthModule` to the `AppModule` imports.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								在 `auth/auth-routing.module.ts` 文件中注册一个 `/login` 路由。在 `app.module.ts` 中，导入 `AuthModule` 并且添加到 `AppModule` 的 `imports` 中。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								<code-tabs>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="src/app/app.module.ts" path="router/src/app/app.module.ts" region="auth">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								  </code-pane>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="src/app/auth/login/login.component.html" path="router/src/app/auth/login/login.component.html">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="src/app/auth/login/login.component.ts" path="router/src/app/auth/login/login.component.1.ts">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="src/app/auth/auth.module.ts" path="router/src/app/auth/auth.module.ts">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								</code-tabs>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a can-activate-child-guard}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								### _CanActivateChild_: guarding child routes
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 纠正错误及翻译遗漏的部分

											
										
										
											2018-03-12 13:04:24 +08:00
+								### `CanActivateChild`：保护子路由
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								You can also protect child routes with the `CanActivateChild` guard.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `CanActivateChild` guard is similar to the `CanActivate` guard.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								The key difference is that it runs _before_  any child route is activated.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你还可以使用 `CanActivateChild` 守卫来保护子路由。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`CanActivateChild` 守卫和 `CanActivate` 守卫很像。
 								它们的区别在于，`CanActivateChild` 会在*任何子路由*被激活之前运行。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								You protected the admin feature module from unauthorized access.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You should also protect child routes _within_ the feature module.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你要保护管理特性模块，防止它被非授权访问，还要保护这个特性模块*内部*的那些子路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Extend the `AuthGuard` to protect when navigating between the `admin` routes.
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Open `auth.guard.ts` and add the `CanActivateChild` interface to the imported tokens from the router package.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								扩展 `AuthGuard` 以便在 `admin` 路由之间导航时提供保护。
-												fix: 翻译错误
											
										
										
											2018-12-31 22:29:10 +08:00
+								打开 `auth.guard.ts` 并从路由库中导入 `CanActivateChild` 接口。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								Next, implement the `canActivateChild()` method which takes the same arguments as the `canActivate()` method:
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								an `ActivatedRouteSnapshot` and `RouterStateSnapshot`.
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								The `canActivateChild()` method can return an `Observable<boolean>` or `Promise<boolean>` for
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								async checks and a `boolean` for sync checks.
 								This one returns a `boolean`:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								接下来，实现 `CanActivateChild` 方法，它所接收的参数与 `CanActivate` 方法一样：一个 `ActivatedRouteSnapshot` 和一个 `RouterStateSnapshot`。
 								`CanActivateChild` 方法可以返回 `Observable<boolean>` 或 `Promise<boolean>` 来支持异步检查，或 `boolean` 来支持同步检查。
 								这里返回的是 `boolean`：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/auth/auth.guard.3.ts" header="src/app/auth/auth.guard.ts (excerpt)" region="can-activate-child"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Add the same `AuthGuard` to the `component-less` admin route to protect all other child routes at one time
 								instead of adding the `AuthGuard` to each route individually.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								同样把这个 `AuthGuard` 添加到“无组件的”管理路由，来同时保护它的所有子路由，而不是为每个路由单独添加这个 `AuthGuard`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/admin/admin-routing.module.3.ts" header="src/app/admin/admin-routing.module.ts (excerpt)" region="can-activate-child"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a can-deactivate-guard}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								### _CanDeactivate_: handling unsaved changes
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
 								### *CanDeactivate*：处理未保存的更改
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Back in the "Heroes" workflow, the app accepts every change to a hero immediately without hesitation or validation.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								回到“Heroes”工作流，该应用毫不犹豫的接受对英雄的任何修改，不作任何校验。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								In the real world, you might have to accumulate the users changes.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								You might have to validate across fields.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You might have to validate on the server.
 								You might have to hold changes in a pending state until the user confirms them *as a group* or
 								cancels and reverts all changes.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在现实世界中，你得先把用户的改动积累起来。
 								你可能不得不进行跨字段的校验，可能要找服务器进行校验，可能得把这些改动保存成一种待定状态，直到用户或者把这些改动*作为一组*进行确认或撤销所有改动。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								What do you do about unapproved, unsaved changes when the user navigates away?
 								You can't just leave and risk losing the user's changes; that would be a terrible experience.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								当用户要导航到外面时，该怎么处理这些既没有审核通过又没有保存过的改动呢？
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								  你不能马上离开，不在乎丢失这些改动的风险，那显然是一种糟糕的用户体验。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								It's better to pause and let the user decide what to do.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								If the user cancels, you'll stay put and allow more changes.
 								If the user approves, the app can save.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								最好能暂停，并让用户决定该怎么做。
-												fix: 把遗漏的 我们 替换成 你

											
										
										
											2018-03-23 09:43:02 +08:00
+								如果用户选择了取消，你就留下来，并允许更多改动。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								如果用户选择了确认，那就进行保存。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You still might delay navigation until the save succeeds.
 								If you let the user move to the next screen immediately and
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								the save were to fail (perhaps the data are ruled invalid), you would lose the context of the error.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在保存成功之前，你还可以继续推迟导航。如果你让用户立即移到下一个界面，而保存却失败了（可能因为数据不符合有效性规则），你就会丢失该错误的上下文环境。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								You can't block while waiting for the server&mdash;that's not possible in a browser.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You need to stop the navigation while you wait, asynchronously, for the server
 								to return with its answer.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在等待服务器的答复时，你没法阻塞它 —— 这在浏览器中是不可能的。
 								  你只能用异步的方式在等待服务器答复之前先停止导航。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You need the `CanDeactivate` guard.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你需要 `CanDeactivate` 守卫。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a cancel-save}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								#### Cancel and save
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								#### 取消与保存
-												fix: translate all pure english titles

											
										
										
											2017-08-04 14:06:15 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The sample application doesn't talk to a server.
 								Fortunately, you have another way to demonstrate an asynchronous router hook.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								这个范例应用不会与服务器通讯。
 								幸运的是，你有另一种方式来演示异步的路由器钩子。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Users update crisis information in the `CrisisDetailComponent`.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Unlike the `HeroDetailComponent`, the user changes do not update the crisis entity immediately.
 								Instead, the app updates the entity when the user presses the *Save* button and
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								discards the changes when the user presses the *Cancel* button.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								用户在 `CrisisDetailComponent` 中更新危机信息。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								与 `HeroDetailComponent` 不同，用户的改动不会立即更新危机的实体对象。当用户按下了 *Save* 按钮时，应用就更新这个实体对象；如果按了 *Cancel* 按钮，那就放弃这些更改。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Both buttons navigate back to the crisis list after save or cancel.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								这两个按钮都会在保存或取消之后导航回危机列表。
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/crisis-center/crisis-detail/crisis-detail.component.ts" header="src/app/crisis-center/crisis-detail/crisis-detail.component.ts (cancel and save methods)" region="cancel-save"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								What if the user tries to navigate away without saving or canceling?
 								The user could push the browser back button or click the heroes link.
 								Both actions trigger a navigation.
 								Should the app save or cancel automatically?
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								如果用户尝试不保存或撤销就导航到外面该怎么办？
 								  用户可以按浏览器的后退按钮，或点击英雄的链接。
 								  这些操作都会触发导航。本应用应该自动保存或取消吗？
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								This demo does neither. Instead, it asks the user to make that choice explicitly
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								in a confirmation dialog box that *waits asynchronously for the user's
 								answer*.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								都不行。应用应该弹出一个确认对话框来要求用户明确做出选择，该对话框会*用异步的方式等用户做出选择*。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/api-page-class.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/elements.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/frequent-ngmodules.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/language-service.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-api.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/releases.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing-observables.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/webpack.md
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/app/custom-elements/live-example/live-example.component.html
#	aio/src/app/custom-elements/live-example/live-example.component.ts
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/styles/main.scss
#	aio/tools/transforms/remark-package/services/renderMarkdown.js

											
										
										
											2018-07-27 10:51:18 +08:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You could wait for the user's answer with synchronous, blocking code.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								The app will be more responsive&mdash;and can do other work&mdash;by
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								waiting for the user's answer asynchronously. Waiting for the user asynchronously
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								is like waiting for the server asynchronously.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你也能用同步的方式等用户的答复，阻塞代码。但如果能用异步的方式等待用户的答复，应用就会响应性更好，也能同时做别的事。异步等待用户的答复和等待服务器的答复是类似的。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Generate a `Dialog` service to handle user confirmation.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								生成一个 `Dialog` 服务，以处理用户的确认操作。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng generate service dialog
 								</code-example>
 								Add a `confirm()` method to the `DialogService` to prompt the user to confirm their intent. The `window.confirm` is a _blocking_ action that displays a modal dialog and waits for user interaction.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								为 `DialogService` 添加一个 `confirm()` 方法，以提醒用户确认。`window.confirm` 是一个*阻塞型*操作，它会显示一个模态对话框，并等待用户的交互。
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/dialog.service.ts" header="src/app/dialog.service.ts"></code-example>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								It returns an `Observable` that *resolves* when the user eventually decides what to do: either
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								to discard changes and navigate away (`true`) or to preserve the pending changes and stay in the crisis editor (`false`).
-												Update: router.md
修改翻译错误

											
										
										
											2018-10-24 14:46:29 +08:00
+								它返回*observable*，当用户最终决定了如何去做时，它就会被*解析* —— 或者决定放弃更改直接导航离开（`true`），或者保留未完成的修改，留在危机编辑器中（`false`）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a CanDeactivate}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Generate a _guard_ that checks for the presence of a `canDeactivate()` method in a component&mdash;any component.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								生成一个*守卫（guard）*，以检查组件（任意组件均可）中是否存在 `canDeactivate()` 方法。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng generate guard can-deactivate
 								</code-example>
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								The `CrisisDetailComponent` will have this method.
 								But the guard doesn't have to know that.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The guard shouldn't know the details of any component's deactivation method.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								It need only detect that the component has a `canDeactivate()` method and call it.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								This approach makes the guard reusable.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								创建了一个 `Guard`，它将检查这个（任意）组件中是否有 `canDeactivate()` 函数。
 								`CrisisDetailComponent` 就会有这个方法。
 								但是该守卫并不需要知道 `CrisisDetailComponent` 确认退出激活状态的详情。
 								它只需要检查该组件是否有一个 `canDeactivate()` 方法，并调用它。
 								这就让该守卫可以复用。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/can-deactivate.guard.ts" header="src/app/can-deactivate.guard.ts"></code-example>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Alternatively, you could make a component-specific `CanDeactivate` guard for the `CrisisDetailComponent`.
 								The `canDeactivate()` method provides you with the current
 								instance of the `component`, the current `ActivatedRoute`,
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								and `RouterStateSnapshot` in case you needed to access
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								some external information. This would be useful if you only
 								wanted to use this guard for this component and needed to get
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								the component's properties or confirm whether the router should allow navigation away from it.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								另外，你也可以为 `CrisisDetailComponent` 创建一个特定的 `CanDeactivate` 守卫。
 								在需要访问外部信息时，`canDeactivate()` 方法为你提供了组件、`ActivatedRoute` 和 `RouterStateSnapshot` 的当前实例。
 								如果只想为这个组件使用该守卫，并且需要获取该组件属性或确认路由器是否允许从该组件导航出去时，这会非常有用。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/can-deactivate.guard.1.ts" header="src/app/can-deactivate.guard.ts (component-specific)"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Looking back at the `CrisisDetailComponent`, it implements the confirmation workflow for unsaved changes.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								看看 `CrisisDetailComponent` 组件，它已经实现了对未保存的更改进行确认的工作流。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/crisis-center/crisis-detail/crisis-detail.component.ts" header="src/app/crisis-center/crisis-detail/crisis-detail.component.ts (excerpt)" region="canDeactivate"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								Notice that the `canDeactivate()` method *can* return synchronously;
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								it returns `true` immediately if there is no crisis or there are no pending changes.
 								But it can also return a `Promise` or an `Observable` and the router will wait for that
 								to resolve to truthy (navigate) or falsy (stay put).
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								注意，`canDeactivate` 方法*可以*同步返回，如果没有危机，或者没有未定的修改，它就立即返回 `true`。但是它也可以返回一个承诺（`Promise`）或可观察对象（`Observable`），路由器将等待它们被解析为真值（继续导航）或假值（留下）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								Add the `Guard` to the crisis detail route in `crisis-center-routing.module.ts` using the `canDeactivate` array property.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								往 `crisis-center.routing.module.ts` 的危机详情路由中用 `canDeactivate` 数组添加一个 `Guard`（守卫）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/crisis-center/crisis-center-routing.module.3.ts" header="src/app/crisis-center/crisis-center-routing.module.ts (can deactivate guard)"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
 								Now you have given the user a safeguard against unsaved changes.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								现在，你已经给了用户一个能保护未保存更改的安全守卫。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
+								{@a Resolve}
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a resolve-guard}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								### _Resolve_: pre-fetching component data
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### _Resolve_: 预先获取组件数据
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								In the `Hero Detail` and `Crisis Detail`, the app waited until the route was activated to fetch the respective hero or crisis.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								在 `Hero Detail` 和 `Crisis Detail` 中，它们等待路由读取完对应的英雄和危机。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								This worked well, but there's a better way.
 								If you were using a real world API, there might be some delay before the data to display is returned from the server.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You don't want to display a blank component while waiting for the data.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								这种方式没有问题，但是它们还有进步的空间。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								  如果你在使用真实 api，很有可能数据返回有延迟，导致无法即时显示。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								  在这种情况下，直到数据到达前，显示一个空的组件不是最好的用户体验。
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								It's preferable to pre-fetch data from the server so it's ready the
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								moment the route is activated. This also allows you to handle errors before routing to the component.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								There's no point in navigating to a crisis detail for an `id` that doesn't have a record.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								It'd be better to send the user back to the `Crisis List` that shows only valid crisis centers.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								最好预先从服务器上获取完数据，这样在路由激活的那一刻数据就准备好了。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								还要在路由到此组件之前处理好错误。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								但当某个 `id` 无法对应到一个危机详情时，就没办法处理它。
 								这时最好把用户带回到“危机列表”中，那里显示了所有有效的“危机”。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								In summary, you want to delay rendering the routed component until all necessary data have been fetched.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								总之，你希望的是只有当所有必要数据都已经拿到之后，才渲染这个路由组件。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You need a *resolver*.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你需要 `Resolve` 守卫。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a fetch-before-navigating}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								#### Fetch data before navigating
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								#### 导航前预先加载路由信息
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								At the moment, the `CrisisDetailComponent` retrieves the selected crisis.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								If the crisis is not found, it navigates back to the crisis list view.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								目前，`CrisisDetailComponent` 会接收选中的危机。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								如果该危机没有找到，它就会导航回危机列表视图。
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								The experience might be better if all of this were handled first, before the route is activated.
 								A `CrisisDetailResolver` service could retrieve a `Crisis` or navigate away if the `Crisis` does not exist
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								_before_ activating the route and creating the `CrisisDetailComponent`.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								如果能在该路由将要激活时提前处理了这个问题，那么用户体验会更好。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`CrisisDetailResolver` 服务可以接收一个 `Crisis`，而如果这个 `Crisis` 不存在，就会在激活该路由并创建 `CrisisDetailComponent` 之前先行离开。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Generate a `CrisisDetailResolver` service file within the `Crisis Center` feature area.
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								在 `Crisis Center` 特性区生成一个 `CrisisDetailResolver` 服务文件。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng generate service crisis-center/crisis-detail-resolver
 								</code-example>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/crisis-center/crisis-detail-resolver.service.1.ts" header="src/app/crisis-center/crisis-detail-resolver.service.ts (generated)"></code-example>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Take the relevant parts of the crisis retrieval logic in `CrisisDetailComponent.ngOnInit`
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								and move them into the `CrisisDetailResolverService`.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Import the `Crisis` model, `CrisisService`, and the `Router`
 								so you can navigate elsewhere if you can't fetch the crisis.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								在 `CrisisDetailComponent.ngOnInit` 中拿到相关的危机检索逻辑，并且把它们移到 `CrisisDetailResolverService` 中。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								导入 `Crisis` 模型、`CrisisService` 和 `Router` 以便让你可以在找不到指定的危机时导航到别处。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Be explicit. Implement the `Resolve` interface with a type of `Crisis`.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								为了更明确一点，可以实现一个带有 `Crisis` 类型的 `Resolve` 接口。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Inject the `CrisisService` and `Router` and implement the `resolve()` method.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								That method could return a `Promise`, an `Observable`, or a synchronous return value.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								注入 `CrisisService` 和 `Router`，并实现 `resolve()` 方法。
 								该方法可以返回一个 `Promise`、一个 `Observable` 来支持异步方式，或者直接返回一个值来支持同步方式。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: sync to 6.0(WIP)

											
										
										
											2018-05-10 13:55:06 +08:00
+								The `CrisisService.getCrisis` method returns an observable, in order to prevent the route from loading until the data is fetched.
 								The `Router` guards require an observable to `complete`, meaning it has emitted all
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								of its values. You use the `take` operator with an argument of `1` to ensure that the
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Observable completes after retrieving the first value from the Observable returned by the
 								`getCrisis` method.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								`CrisisService.getCrisis` 方法返回一个可观察对象，以防止在数据获取完之前加载本路由。
 								`Router` 守卫要求这个可观察对象必须可结束（`complete`），也就是说它已经发出了所有值。
 								你可以为 `take` 操作符传入一个参数 `1`，以确保这个可观察对象会在从 `getCrisis` 方法所返回的可观察对象中取到第一个值之后就会结束。
-												docs: fix typo on router guide (#34911)

closes #34907
PR Close #34911

											
										
										
											2020-01-22 13:10:25 -08:00
+								If it doesn't return a valid `Crisis`, return an empty `Observable`, canceling the previous in-flight navigation to the `CrisisDetailComponent` and navigate the user back to the `CrisisListComponent`. The updated resolver service looks like this:
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								如果它没有返回有效的 `Crisis`，就会返回一个 `Observable`，以取消以前到 `CrisisDetailComponent` 的在途导航，并把用户导航回 `CrisisListComponent`。修改后的 `resolver` 服务是这样的：
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/crisis-center/crisis-detail-resolver.service.ts" header="src/app/crisis-center/crisis-detail-resolver.service.ts"></code-example>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Import this resolver in the `crisis-center-routing.module.ts`
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								and add a `resolve` object to the `CrisisDetailComponent` route configuration.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								把这个解析器（resolver）导入到 `crisis-center-routing.module.ts` 中，并往 `CrisisDetailComponent` 的路由配置中添加一个 `resolve` 对象。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/crisis-center/crisis-center-routing.module.4.ts" header="src/app/crisis-center/crisis-center-routing.module.ts (resolver)"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `CrisisDetailComponent` should no longer fetch the crisis.
 								Update the `CrisisDetailComponent` to get the crisis from the  `ActivatedRoute.data.crisis` property instead;
 								that's where you said it should be when you re-configured the route.
 								It will be there when the `CrisisDetailComponent` ask for it.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`CrisisDetailComponent` 不应该再去获取这个危机的详情。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								把 `CrisisDetailComponent` 改成从 `ActivatedRoute.data.crisis` 属性中获取危机详情，这正是你重新配置路由的恰当时机。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								当 `CrisisDetailComponent` 要求取得危机详情时，它就已经在那里了。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/crisis-center/crisis-detail/crisis-detail.component.ts" header="src/app/crisis-center/crisis-detail/crisis-detail.component.ts (ngOnInit v2)" region="ngOnInit"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: router guide review feedback changes (#20023)

PR Close #20023

											
										
										
											2018-09-10 08:37:21 -05:00
+								**Two critical points**
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								**两个关键点**
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+. The router's `Resolve` interface is optional.
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								The `CrisisDetailResolverService` doesn't inherit from a base class.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The router looks for that method and calls it if found.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								   路由器的这个 `Resolve` 接口是可选的。`CrisisDetailResolverService` 没有继承自某个基类。路由器只要找到了这个方法，就会调用它。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+. Rely on the router to call the resolver.
-												docs: remove redundant whitespaces and fix minor typos (#33422)

PR Close #33422

											
										
										
											2019-10-26 21:35:03 +07:00
+								Don't worry about all the ways that the user could navigate away.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								That's the router's job. Write this class and let the router take it from there.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								   要依赖路由器调用此守卫。不必关心用户用哪种方式导航离开，这是路由器的工作。你只要写出这个类，等路由器从那里取出它就可以了。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The relevant *Crisis Center* code for this milestone follows.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								本里程碑中与*危机中心*有关的代码如下：
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								<code-tabs>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="app.component.html" path="router/src/app/app.component.html">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								  </code-pane>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="crisis-center-home.component.html" path="router/src/app/crisis-center/crisis-center-home/crisis-center-home.component.html">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								  </code-pane>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="crisis-center.component.html" path="router/src/app/crisis-center/crisis-center/crisis-center.component.html">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								  </code-pane>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="crisis-center-routing.module.ts" path="router/src/app/crisis-center/crisis-center-routing.module.4.ts">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="crisis-list.component.html" path="router/src/app/crisis-center/crisis-list/crisis-list.component.html">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="crisis-list.component.ts" path="router/src/app/crisis-center/crisis-list/crisis-list.component.ts">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="crisis-detail.component.html" path="router/src/app/crisis-center/crisis-detail/crisis-detail.component.html">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: fix crisis-detail milestone files (#27025)

Crisis Detail's template was being added two times and the component's TS none.
PR Close #27025

											
										
										
											2018-11-09 09:01:36 -02:00
+								  <code-pane header="crisis-detail.component.ts" path="router/src/app/crisis-center/crisis-detail/crisis-detail.component.ts">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="crisis-detail-resolver.service.ts" path="router/src/app/crisis-center/crisis-detail-resolver.service.ts">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="crisis.service.ts" path="router/src/app/crisis-center/crisis.service.ts">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="dialog.service.ts" path="router/src/app/dialog.service.ts">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								</code-tabs>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Guards
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								路由守卫
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								<code-tabs>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="auth.guard.ts" path="router/src/app/auth/auth.guard.3.ts">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="can-deactivate.guard.ts" path="router/src/app/can-deactivate.guard.ts">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
 								</code-tabs>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
 								{@a query-parameters}
 								{@a fragment}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								### Query parameters and fragments
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 查询参数及片段
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								In the [route parameters](#optional-route-parameters) example, you only dealt with parameters specific to
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								the route, but what if you wanted optional parameters available to all routes?
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								This is where query parameters come into play.
-												fix: 修复路由与导航章节中的一个锚点跳转地址错误
											
										
										
											2018-12-23 00:09:29 +08:00
+								在这个[查询参数](#optional-route-parameters)例子中，你只为路由指定了参数，但是该如何定义一些所有路由中都可用的可选参数呢？
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								这就该“查询参数”登场了。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								[Fragments](https://en.wikipedia.org/wiki/Fragment_identifier) refer to certain elements on the page
 								identified with an `id` attribute.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								[片段](https://en.wikipedia.org/wiki/Fragment_identifier)可以引用页面中带有特定 `id` 属性的元素.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Update the `AuthGuard` to provide a `session_id` query that will remain after navigating to another route.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								修改 `AuthGuard` 以提供 `session_id` 查询参数，在导航到其它路由后，它还会存在。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Add an `anchor` element so you can jump to a certain point on the page.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								再添加一个锚点（`A`）元素，来让你能跳转到页面中的正确位置。
-												docs: fix redirect with secondary outlet in router guide example (#29267)

The URL wasn't be parsed into a UrlTree, so redirecting with a
secondary route went to a 404

Closes #28805

PR Close #29267

											
										
										
											2019-03-12 19:49:39 +00:00
+								Add the `NavigationExtras` object to the `router.navigate()` method that navigates you to the `/login` route.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								为 `router.navigate()` 方法添加一个 `NavigationExtras` 对象，用来导航到 `/login` 路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/auth/auth.guard.4.ts" header="src/app/auth/auth.guard.ts (v3)"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								You can also preserve query parameters and fragments across navigations without having to provide them
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								again when navigating. In the `LoginComponent`, you'll add an *object* as the
-												docs: fix redirect with secondary outlet in router guide example (#29267)

The URL wasn't be parsed into a UrlTree, so redirecting with a
secondary route went to a 404

Closes #28805

PR Close #29267

											
										
										
											2019-03-12 19:49:39 +00:00
+								second argument in the `router.navigateUrl()` function
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								and provide the `queryParamsHandling` and `preserveFragment` to pass along the current query parameters
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								and fragment to the next route.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								还可以在导航之间**保留**查询参数和片段，而无需再次在导航中提供。在 `LoginComponent` 中的 `router.navigateUrl()` 方法中，添加一个对象作为第二个参数，该**对象**提供了 `queryParamsHandling` 和 `preserveFragment`，用于传递当前的查询参数和片段到下一个路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/auth/login/login.component.ts" header="src/app/auth/login/login.component.ts (preserve)" region="preserve"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
 								The `queryParamsHandling` feature also provides a `merge` option, which will preserve and combine the current query parameters with any provided query parameters
 								when navigating.
-												fix: 翻译《路由与导航》中遗漏的部分
fix: 把 header 修复成双行对照的格式

											
										
										
											2018-03-14 09:13:52 +08:00
+								`queryParamsHandling` 特性还提供了 `merge` 选项，它将会在导航时保留当前的查询参数，并与其它查询参数合并。
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								</div>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								As you'll be navigating to the *Admin Dashboard* route after logging in, you'll update it to handle the
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								query parameters and fragment.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 部分 更新 替换成 修改

											
										
										
											2018-03-23 09:48:55 +08:00
+								由于要在登录后导航到*危机管理*特征区的路由，所以你还得修改它，来处理这些全局查询参数和片段。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/admin/admin-dashboard/admin-dashboard.component.1.ts" header="src/app/admin/admin-dashboard/admin-dashboard.component.ts (v2)"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								*Query parameters* and *fragments* are also available through the `ActivatedRoute` service.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Just like *route parameters*, the query parameters and fragments are provided as an `Observable`.
 								The updated *Crisis Admin* component feeds the `Observable` directly into the template using the `AsyncPipe`.
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								*查询参数*和*片段*可通过 `Router` 服务的 `routerState` 属性使用。和*路由参数*类似，全局查询参数和片段也是 `Observable` 对象。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								  在修改过的*英雄管理*组件中，你将借助 `AsyncPipe` 直接把 `Observable` 传给模板。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Now, you can click on the *Admin* button, which takes you to the *Login*
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								page with the provided `queryParamMap` and `fragment`. After you click the login button, notice that
 								you have been redirected to the `Admin Dashboard` page with the query parameters and fragment still intact in the address bar.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								按照下列步骤试验下：点击*Crisis Admin*按钮，它会带着你提供的 `queryParamMap` 和 `fragment` 跳转到登录页。
 								点击登录按钮，你就会被重定向到 `Admin Dashboard` 页。
 								注意，它仍然带着上一步提供的 `queryParamMap` 和 `fragment`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								You can use these persistent bits of information for things that need to be provided across pages like
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								authentication tokens or session ids.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你可以用这些持久化信息来携带需要为每个页面都提供的信息，如认证令牌或会话的 ID 等。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `query params` and `fragment` can also be preserved using a `RouterLink` with
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								the `queryParamsHandling` and `preserveFragment` bindings respectively.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 修复路由与导航章节中的一个参数名称错误
											
										
										
											2018-12-23 00:38:01 +08:00
+								“查询参数”和“片段”也可以分别用 `RouterLink` 中的 **queryParamsHandling** 和 **preserveFragment** 保存。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): fix lots of broken links

Closes #16317

											
										
										
											2017-04-30 22:10:32 +02:00
+								{@a asynchronous-routing}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								## Milestone 6: Asynchronous routing
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								## 里程碑 6：异步路由
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								As you've worked through the milestones, the application has naturally gotten larger.
 								As you continue to build out feature areas, the overall application size will continue to grow.
-												docs: fix wording (#26207)

fix wording to sound better
PR Close #26207

											
										
										
											2018-10-02 00:33:08 +01:00
+								At some point you'll reach a tipping point where the application takes a long time to load.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix:错别字及语法

											
										
										
											2018-08-23 21:51:48 +08:00
+								完成上面的里程碑后，应用程序很自然地长大了。在继续构建特征区的过程中，应用的尺寸将会变得更大。在某一个时间点，你将达到一个顶点，应用将会需要过多的时间来加载。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								How do you combat this problem?  With asynchronous routing, which loads feature modules _lazily_, on request.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Lazy loading has multiple benefits.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								如何才能解决这个问题呢？通过引进异步路由，可以获得在请求时才**惰性**加载特性模块的能力。
 								惰性加载有多个优点：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* You can load feature areas only when requested by the user.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								   你可以只在用户请求时才加载某些特性区。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* You can speed up load time for users that only visit certain areas of the application.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   对于那些只访问应用程序某些区域的用户，这样能加快加载速度。
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* You can continue expanding lazy loaded feature areas without increasing the size of the initial load bundle.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								   你可以持续扩充惰性加载特性区的功能，而不用增加初始加载的包体积。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: fix typo (#23998)

"Made" doesn't make sense (redoing and closing #23940)
PR Close #23998

											
										
										
											2018-05-18 12:49:09 -04:00
+								You're already part of the way there.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								By organizing the application into modules&mdash;`AppModule`,
 								`HeroesModule`, `AdminModule` and `CrisisCenterModule`&mdash;you
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								have natural candidates for lazy loading.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你已经完成了一部分。通过把应用组织成一些模块：`AppModule`、`HeroesModule`、`AdminModule` 和 `CrisisCenterModule`，
 								你已经有了可用于实现惰性加载的候选者。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Some modules, like `AppModule`, must be loaded from the start.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								But others can and should be lazy loaded.
 								The `AdminModule`, for example, is needed by a few authorized users, so
 								you should only load it when requested by the right people.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								有些模块（比如 `AppModule`）必须在启动时加载，但其它的都可以而且应该惰性加载。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								比如 `AdminModule` 就只有少数已认证的用户才需要它，所以你应该只有在正确的人请求它时才加载。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a lazy-loading-route-config}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								### Lazy Loading route configuration
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 惰性加载路由配置
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Change the `admin` **path** in the `admin-routing.module.ts` from `'admin'` to an empty string, `''`, the _empty path_.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								把 `admin-routing.module.ts` 中的 `admin` 路径从 `'admin'` 改为空路径 `''`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `Router` supports  *empty path* routes;
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								use them to group routes together without adding any additional path segments to the URL.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Users will still visit `/admin` and the `AdminComponent` still serves as the *Routing Component* containing child routes.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`Router` 支持*空路径*路由，可以使用它们来分组路由，而不用往 URL 中添加额外的路径片段。
 								用户仍旧访问 `/admin`，并且 `AdminComponent` 仍然作为用来包含子路由的*路由组件*。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Open the `AppRoutingModule` and add a new `admin` route to its `appRoutes` array.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								打开 `AppRoutingModule`，并把一个新的 `admin` 路由添加到它的 `appRoutes` 数组中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: use dynamic import syntax in examples using lazy loading (#30563)

PR Close #30563

											
										
										
											2019-05-17 14:31:48 -05:00
+								Give it a `loadChildren` property instead of a `children` property.
 								The `loadChildren` property takes a function that returns a promise using the browser's built-in syntax for lazy loading code using dynamic imports `import('...')`.
 								The path is the location of the `AdminModule` (relative to the app root).
-												Merge branch 'en-master' into aio

											
										
										
											2019-06-07 12:29:04 +08:00
+								After the code is requested and loaded, the `Promise` resolves an object that contains the `NgModule`, in this case the  `AdminModule`.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 修订合并冲突

											
										
										
											2019-06-07 13:37:23 +08:00
+								给它一个 `loadChildren` 属性（替换掉 `children` 属性）。
 								`loadChildren` 属性接收一个函数，该函数使用浏览器内置的动态导入语法 `import('...')` 来惰性加载代码，并返回一个承诺（Promise）。
 								其路径是 `AdminModule` 的位置（相对于应用的根目录）。
 								当代码请求并加载完毕后，这个 `Promise` 就会解析成一个包含 `NgModule` 的对象，也就是 `AdminModule`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app-routing.module.5.ts" region="admin-1" header="app-routing.module.ts (load children)"></code-example>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<div class="alert is-important">
 								*Note*: When using absolute paths, the `NgModule` file location must begin with `src/app` in order to resolve correctly. For custom [path mapping with absolute paths](https://www.typescriptlang.org/docs/handbook/module-resolution.html#path-mapping), the `baseUrl` and `paths` properties in the project `tsconfig.json` must be configured.
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts

											
										
										
											2018-10-21 17:43:29 +08:00
+								**注意**： 当使用绝对路径时，`NgModule` 的文件位置必须以 `src/app` 开头，以便正确解析。对于自定义的 [使用绝对路径的路径映射表](https://www.typescriptlang.org/docs/handbook/module-resolution.html#path-mapping)，项目的 `tsconfig.json` 中必须配置好 `baseUrl` 和 `paths` 属性。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								</div>
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								When the router navigates to this route, it uses the `loadChildren` string to dynamically load the `AdminModule`.
 								Then it adds the `AdminModule` routes to its current route configuration.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Finally, it loads the requested route to the destination admin component.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								当路由器导航到这个路由时，它会用 `loadChildren` 字符串来动态加载 `AdminModule`，然后把 `AdminModule` 添加到当前的路由配置中，
 								最后，它把所请求的路由加载到目标 `admin` 组件中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The lazy loading and re-configuration happen just once, when the route is _first_ requested;
 								the module and routes are available immediately for subsequent requests.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								惰性加载和重新配置工作只会发生一次，也就是在该路由*首次*被请求时。在后续的请求中，该模块和路由都是立即可用的。
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Angular provides a built-in module loader that supports SystemJS to load modules asynchronously. If you were
 								using another bundling tool, such as Webpack, you would use the Webpack mechanism for asynchronously loading modules.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								Angular 提供一个内置模块加载器，支持**`SystemJS`**来异步加载模块。如果你使用其它捆绑工具比如 **Webpack**，则使用 Webpack 的机制来异步加载模块。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Take the final step and detach the admin feature set from the main application.
 								The root `AppModule` must neither load nor reference the `AdminModule` or its files.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								最后一步是把管理特性区从主应用中完全分离开。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								根模块 `AppModule` 既不能加载也不能引用 `AdminModule` 及其文件。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								In `app.module.ts`, remove the `AdminModule` import statement from the top of the file
-												docs(aio): change Angular Module to NgModule (#16964)


											
										
										
											2017-07-11 18:05:20 -04:00
+								and remove the `AdminModule` from the NgModule's `imports` array.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 精修翻译

恢复一些过度省略的 "Angular"
Angular 模块恢复为 NgModule

											
										
										
											2019-01-27 22:10:45 +08:00
+								在 `app.module.ts` 中，从顶部移除 `AdminModule` 的导入语句，并且从 NgModule 的 `imports` 数组中移除 `AdminModule`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a can-load-guard}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								### _CanLoad_ Guard: guarding unauthorized loading of feature modules
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								### `CanLoad` 守卫：保护对特性模块的未授权加载
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You're already protecting the `AdminModule` with a `CanActivate` guard that prevents unauthorized users from
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								accessing the admin feature area.
-												docs: remove redundant whitespaces and fix minor typos (#33422)

PR Close #33422

											
										
										
											2019-10-26 21:35:03 +07:00
+								It redirects to the login page if the user is not authorized.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你已经使用 `CanActivate` 保护 `AdminModule` 了，它会阻止未授权用户访问管理特性区。如果用户未登录，它就会跳转到登录页。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								But the router is still loading the `AdminModule` even if the user can't visit any of its components.
-												docs(aio): fix paths to images

											
										
										
											2017-03-06 10:43:33 +00:00
+								Ideally, you'd only load the `AdminModule` if the user is logged in.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								但是路由器仍然会加载 `AdminModule` —— 即使用户无法访问它的任何一个组件。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								理想的方式是，只有在用户已登录的情况下你才加载 `AdminModule`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Add a **`CanLoad`** guard that only loads the `AdminModule` once the user is logged in _and_ attempts to access the admin feature area.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								添加一个**`CanLoad`**守卫，它只在用户已登录*并且*尝试访问管理特性区的时候，才加载 `AdminModule` 一次。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								The existing `AuthGuard` already has the essential logic in
 								its `checkLogin()` method to support the `CanLoad` guard.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								现有的 `AuthGuard` 的 `checkLogin()` 方法中已经有了支持 `CanLoad` 守卫的基础逻辑。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Open `auth.guard.ts`.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Import the `CanLoad` interface from `@angular/router`.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Add it to the `AuthGuard` class's `implements` list.
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								Then implement `canLoad()` as follows:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 翻译错误
											
										
										
											2018-12-31 22:29:10 +08:00
+								打开 `auth.guard.ts`，从 `@angular/router` 中导入 `CanLoad` 接口。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								把它添加到 `AuthGuard` 类的 `implements` 列表中。
 								然后实现 `canLoad`，代码如下：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/auth/auth.guard.ts" header="src/app/auth/auth.guard.ts (CanLoad guard)" region="canLoad"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								The router sets the `canLoad()` method's `route` parameter to the intended destination URL.
 								The `checkLogin()` method redirects to that URL once the user has logged in.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								路由器会把 `canLoad()` 方法的 `route` 参数设置为准备访问的目标 URL。
 								如果用户已经登录了，`checkLogin()` 方法就会重定向到那个 URL。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Now import the `AuthGuard` into the `AppRoutingModule` and add the `AuthGuard` to the `canLoad`
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								array property for the `admin` route.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								The completed admin route looks like this:
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								现在，把 `AuthGuard` 导入到 `AppRoutingModule` 中，并把 `AuthGuard` 添加到 `admin` 路由的 `canLoad` 数组中。
 								完整的 `admin` 路由是这样的：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app-routing.module.5.ts" region="admin" header="app-routing.module.ts (lazy admin route)"></code-example>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
 								{@a preloading}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								### Preloading: background loading of feature areas
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
 								### 预加载：特性区的后台加载
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You've learned how to load modules on-demand.
 								You can also load modules asynchronously with _preloading_.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你已经学会了如何按需加载模块，接下来再看看如何使用*预加载*技术异步加载模块。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								This may seem like what the app has been doing all along. Not quite.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								The `AppModule` is loaded when the application starts; that's _eager_ loading.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Now the `AdminModule` loads only when the user clicks on a link; that's _lazy_ loading.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								看起来好像应用一直都是这么做的，但其实并非如此。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`AppModule` 在应用启动时就被加载了，它是*立即*加载的。
 								而 `AdminModule` 只有当用户点击某个链接时才会加载，它是*惰性*加载的。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								_Preloading_ is something in between.
 								Consider the _Crisis Center_.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								It isn't the first view that a user sees.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								By default, the _Heroes_ are the first view.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								For the smallest initial payload and fastest launch time,
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								you should eagerly load the `AppModule` and the `HeroesModule`.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								*预加载*是介于两者之间的一种方式。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								来看看*危机中心*。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								用户第一眼不会看到它。
 								默认情况下，*英雄管理*才是第一视图。
-												fix: 修复一些翻译错误

											
										
										
											2019-01-26 22:58:06 +08:00
+								为了获得尽可能小的初始加载体积和最快的加载速度，你应该对 `AppModule` 和 `HeroesModule` 进行急性加载。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You could lazy load the _Crisis Center_.
 								But you're almost certain that the user will visit the _Crisis Center_ within minutes of launching the app.
 								Ideally, the app would launch with just the `AppModule` and the `HeroesModule` loaded
 								and then, almost immediately, load the `CrisisCenterModule` in the background.
 								By the time the user navigates to the _Crisis Center_, its module will have been loaded and ready to go.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你可以惰性加载*危机中心*。
 								但是，你几乎可以肯定用户会在启动应用之后的几分钟内访问*危机中心*。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								理想情况下，应用启动时应该只加载 `AppModule` 和 `HeroesModule`，然后几乎立即开始后台加载 `CrisisCenterModule`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								在用户浏览到*危机中心*之前，该模块应该已经加载完毕，可供访问了。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								That's _preloading_.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								这就是*预加载*。
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a how-preloading}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								#### How preloading works
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								#### 预加载的工作原理
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								After each _successful_ navigation, the router looks in its configuration for an unloaded module that it can preload.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Whether it preloads a module, and which modules it preloads, depends upon the *preload strategy*.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								在每次*成功的*导航后，路由器会在自己的配置中查找尚未加载并且可以预加载的模块。
 								是否加载某个模块，以及要加载哪些模块，取决于*预加载策略*。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The `Router` offers two preloading strategies out of the box:
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`Router` 内置了两种预加载策略：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* No preloading at all which is the default. Lazy loaded feature areas are still loaded on demand.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   完全不预加载，这是默认值。惰性加载的特性区仍然会按需加载。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* Preloading of all lazy loaded feature areas.
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   预加载所有惰性加载的特性区。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Out of the box, the router either never preloads, or preloads every lazy load module.
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								The `Router` also supports [custom preloading strategies](#custom-preloading) for
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								fine control over which modules to preload and when.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								默认情况下，路由器或者完全不预加载或者预加载每个惰性加载模块。
 								路由器还支持[自定义预加载策略](guide/router#custom-preloading)，以便完全控制要预加载哪些模块以及何时加载。
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								In this next section, you'll update the `CrisisCenterModule` to load lazily
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								by default and use the `PreloadAllModules` strategy
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								to load it (and _all other_ lazy loaded modules) as soon as possible.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在下一节，你将会把 `CrisisCenterModule` 改为默认惰性加载的，并使用 `PreloadAllModules` 策略来尽快加载它（以及*所有其它*惰性加载模块）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a lazy-load-crisis-center}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								#### Lazy load the _crisis center_
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								#### 惰性加载*危机中心*
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Update the route configuration to lazy load the `CrisisCenterModule`.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Take the same steps you used to configure `AdminModule` for lazy load.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								修改路由配置，来惰性加载 `CrisisCenterModule`。修改的步骤和配置惰性加载 `AdminModule` 时一样。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+. Change the `crisis-center` path in the `CrisisCenterRoutingModule` to an empty string.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   把 `CrisisCenterRoutingModule` 中的路径从 `crisis-center` 改为空字符串。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+. Add a `crisis-center` route to the `AppRoutingModule`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   往 `AppRoutingModule` 中添加一个 `crisis-center` 路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+. Set the `loadChildren` string to load the `CrisisCenterModule`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   设置 `loadChildren` 字符串来加载 `CrisisCenterModule`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+. Remove all mention of the `CrisisCenterModule` from `app.module.ts`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   从 `app.module.ts` 中移除所有对 `CrisisCenterModule` 的引用。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Here are the updated modules _before enabling preload_:
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								下面是打开预加载之前的模块修改版：
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								<code-tabs>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="app.module.ts" path="router/src/app/app.module.ts" region="preload">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								  </code-pane>
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="app-routing.module.ts" path="router/src/app/app-routing.module.6.ts" region="preload-v1">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396)

Closes #26174

PR Close #26396

											
										
										
											2018-10-11 13:29:59 +02:00
+								  <code-pane header="crisis-center-routing.module.ts" path="router/src/app/crisis-center/crisis-center-routing.module.ts">
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								  </code-pane>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
+								</code-tabs>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
 								You could try this now and confirm that the  `CrisisCenterModule` loads after you click the "Crisis Center" button.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你可以现在尝试它，并确认在点击了“Crisis Center”按钮之后加载了 `CrisisCenterModule`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								To enable preloading of all lazy loaded modules, import the `PreloadAllModules` token from the Angular router package.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								要为所有惰性加载模块启用预加载功能，请从 Angular 的路由模块中导入 `PreloadAllModules`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								The second argument in the `RouterModule.forRoot()` method takes an object for additional configuration options.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								The `preloadingStrategy` is one of those options.
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								Add the `PreloadAllModules` token to the `forRoot()` call:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								`RouterModule.forRoot()` 方法的第二个参数接受一个附加配置选项对象。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`preloadingStrategy` 就是其中之一。
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								把 `PreloadAllModules` 添加到 `forRoot()` 调用中：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	.nvmrc
#	aio/content/cli/index.md
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/app-shell.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bazel.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/build.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/cli-builder.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/complex-animation-sequences.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/creating-libraries.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-navtree.md
#	aio/content/guide/dependency-injection-providers.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/deprecations.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/dynamic-form.md
#	aio/content/guide/elements.md
#	aio/content/guide/entry-components.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/file-structure.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms-overview.md
#	aio/content/guide/forms.md
#	aio/content/guide/frequent-ngmodules.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/ivy.md
#	aio/content/guide/language-service.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/module-types.md
#	aio/content/guide/ngmodule-api.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/providers.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/releases.md
#	aio/content/guide/reusable-animations.md
#	aio/content/guide/route-animations.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/schematics-authoring.md
#	aio/content/guide/schematics-for-libraries.md
#	aio/content/guide/schematics.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-devops.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-local.md
#	aio/content/guide/sharing-ngmodules.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/static-query-migration.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/transition-and-triggers.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade-setup.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/using-libraries.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/web-worker.md
#	aio/content/guide/workspace-config.md
#	aio/content/marketing/events.html
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/content/start/data.md
#	aio/content/start/deployment.md
#	aio/content/start/forms.md
#	aio/content/start/index.md
#	aio/content/start/routing.md
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/app/app.component.spec.ts
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/app/layout/mode-banner/mode-banner.component.ts
#	aio/src/app/layout/nav-item/nav-item.component.html
#	aio/src/app/shared/toc.service.ts
#	aio/src/styles/0-base/_typography.scss
#	aio/src/styles/2-modules/_api-pages.scss
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/yarn.lock
#	packages/common/http/src/headers.ts
#	packages/common/http/src/interceptor.ts
#	packages/common/http/src/params.ts
#	packages/common/http/src/response.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/date_pipe.ts
#	packages/core/src/change_detection/pipe_transform.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/directives.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render3/component_ref.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/form_builder.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/directives/router_outlet.ts
#	packages/router/src/events.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts
#	packages/router/src/shared.ts

											
										
										
											2020-01-11 18:10:12 +08:00
+								<code-example path="router/src/app/app-routing.module.6.ts" header="src/app/app-routing.module.ts (preload all)" region="forRoot"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
 								This tells the `Router` preloader to immediately load _all_ lazy loaded routes (routes with a `loadChildren` property).
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								这会让 `Router` 预加载器立即加载*所有*惰性加载路由（带 `loadChildren` 属性的路由）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								When you visit `http://localhost:4200`, the `/heroes` route loads immediately upon launch
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								and the router starts loading the `CrisisCenterModule` right after the `HeroesModule` loads.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								当访问 `http://localhost:4200` 时，`/heroes` 路由立即随之启动，并且路由器在加载了 `HeroesModule` 之后立即开始加载 `CrisisCenterModule`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Surprisingly, the `AdminModule` does _not_ preload. Something is blocking it.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								意外的是，`AdminModule`*没有*预加载，有什么东西阻塞了它。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a preload-canload}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								#### CanLoad blocks preload
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								#### CanLoad 会阻塞预加载
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								The `PreloadAllModules` strategy does not load feature areas protected by a [CanLoad](#can-load-guard) guard.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								This is by design.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`PreloadAllModules` 策略不会加载被[CanLoad](guide/router#can-load-guard)守卫所保护的特性区。这是刻意设计的。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								You added a `CanLoad` guard to the route in the `AdminModule` a few steps back
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								to block loading of that module until the user is authorized.
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								That `CanLoad` guard takes precedence over the preload strategy.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你几步之前刚刚给 `AdminModule` 中的路由添加了 `CanLoad` 守卫，以阻塞加载那个模块，直到用户认证结束。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`CanLoad` 守卫的优先级高于预加载策略。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								If you want to preload a module _and_ guard against unauthorized access,
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								drop the `canLoad()` guard method and rely on the [canActivate()](#can-activate-guard) guard alone.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								如果你要加载一个模块*并且*保护它防止未授权访问，请移除 `canLoad` 守卫，只单独依赖[CanActivate](guide/router#can-activate-guard)守卫。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a custom-preloading}
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								### Custom Preloading Strategy
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								### 自定义预加载策略
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Preloading every lazy loaded modules works well in many situations,
 								but it isn't always the right choice, especially on mobile devices and over low bandwidth connections.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You may choose to preload only certain feature modules, based on user metrics and other business and technical factors.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								在大多数场景下，预加载每个惰性加载模块就很好了，但是有时候它却并不是正确的选择，特别是在移动设备和低带宽连接下。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你可能出于用户的测量和其它商业和技术因素而选择只对某些特性模块进行预加载。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You can control what and how the router preloads with a custom preloading strategy.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								使用自定义预加载策略，你可以控制路由器预加载哪些路由以及如何加载。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								In this section, you'll add a custom strategy that _only_ preloads routes whose `data.preload` flag is set to `true`.
 								Recall that you can add anything to the `data` property of a route.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在这一节，你将添加一个自定义策略，它*只*预加载那些 `data.preload` 标志为 `true` 的路由。
 								回忆一下，你可以往路由的 `data` 属性中添加任何东西。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Set the `data.preload` flag in the `crisis-center` route in the `AppRoutingModule`.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								在 `AppRoutingModule` 的 `crisis-center` 路由中设置 `data.preload` 标志。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app-routing.module.ts" header="src/app/app-routing.module.ts (route data preload)" region="preload-v2"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								Generate a new `SelectivePreloadingStrategy` service.
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								生成一个新的 `SelectivePreloadingStrategy` 服务。
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								<code-example language="none" class="code-shell">
 								  ng generate service selective-preloading-strategy
 								</code-example>
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/selective-preloading-strategy.service.ts" header="src/app/selective-preloading-strategy.service.ts (excerpt)"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								`SelectivePreloadingStrategyService` implements the `PreloadingStrategy`, which has one method, `preload`.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								`SelectivePreloadingStrategyService` 实现了 `PreloadingStrategy`，它只有一个方法 `preload`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								The router calls the `preload` method with two arguments:
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								路由器会用两个参数调用调用 `preload` 方法：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+. The route to consider.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   要加载的路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+. A loader function that can load the routed module asynchronously.
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   一个加载器（loader）函数，它能异步加载带路由的模块。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: sync to 6.0(WIP)

											
										
										
											2018-05-10 13:55:06 +08:00
+								An implementation of `preload` must return an `Observable`.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								If the route should preload, it returns the observable returned by calling the loader function.
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								If the route should _not_ preload, it returns an `Observable` of `null`.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								`preload` 的实现必须返回一个 `Observable`。
 								如果该路由应该预加载，它就会返回调用加载器函数所返回的 `Observable`。
 								如果该路由*不*应该预加载，它就返回一个 `null` 值的 `Observable` 对象。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								In this sample, the  `preload` method loads the route if the route's `data.preload` flag is truthy.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								在这个例子中，`preload` 方法只有在路由的 `data.preload` 标识为真时才会加载该路由。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								It also has a side-effect.
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								`SelectivePreloadingStrategyService` logs the `path` of a selected route in its public `preloadedModules` array.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								它还有一个副作用。
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								`SelectivePreloadingStrategyService` 会把所选路由的 `path` 记录在它的公共数组 `preloadedModules` 中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Shortly, you'll extend the `AdminDashboardComponent` to inject this service and display its `preloadedModules` array.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								很快，你就会扩展 `AdminDashboardComponent` 来注入该服务，并且显示它的 `preloadedModules` 数组。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								But first, make a few changes to the `AppRoutingModule`.
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								但是首先，要对 `AppRoutingModule` 做少量修改。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+. Import `SelectivePreloadingStrategyService` into `AppRoutingModule`.
-												fix: 不正常的中英文段落合并

											
										
										
											2018-02-28 13:43:40 +08:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								   把 `SelectivePreloadingStrategyService` 导入到 `AppRoutingModule` 中。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+. Replace the `PreloadAllModules` strategy in the call to `forRoot()` with this `SelectivePreloadingStrategyService`.
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								   把 `PreloadAllModules` 策略替换成对 `forRoot()` 的调用，并且传入这个 `SelectivePreloadingStrategyService`。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+. Add the `SelectivePreloadingStrategyService` strategy to the `AppRoutingModule` providers array so it can be injected
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								elsewhere in the app.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								   把 `SelectivePreloadingStrategyService` 策略添加到 `AppRoutingModule` 的 `providers` 数组中，以便它可以注入到应用中的任何地方。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Now edit the `AdminDashboardComponent` to display the log of preloaded routes.
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								现在，编辑 `AdminDashboardComponent` 以显示这些预加载路由的日志。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+. Import the `SelectivePreloadingStrategyService`.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								   导入 `SelectivePreloadingStrategyService`（它是一个服务）。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+. Inject it into the dashboard's constructor.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   把它注入到仪表盘的构造函数中。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+. Update the template to display the strategy service's `preloadedModules` array.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   修改模板来显示这个策略服务的 `preloadedModules` 数组。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								When you're done it looks like this.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								当完成时，代码如下：
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/admin/admin-dashboard/admin-dashboard.component.ts" header="src/app/admin/admin-dashboard/admin-dashboard.component.ts (preloaded modules)"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Once the application loads the initial route, the `CrisisCenterModule` is preloaded.
 								Verify this by logging in to the `Admin` feature area and noting that the `crisis-center` is listed in the `Preloaded Modules`.
 								It's also logged to the browser's console.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								一旦应用加载完了初始路由，`CrisisCenterModule` 也被预加载了。
-												fix:修正路由与导航章节的一个翻译错误
											
										
										
											2018-12-24 20:41:27 +08:00
+								通过 `Admin` 特性区中的记录就可以验证它，“Preloaded Modules”中列出了 `crisis-center`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								它也被记录到了浏览器的控制台。
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								{@a redirect-advanced}
 								## Migrating URLs with Redirects
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
+								## 使用重定向迁移 URL
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								You've setup the routes for navigating around your application. You've used navigation imperatively and declaratively to many different routes. But like any application, requirements change over time. You've setup links and navigation to `/heroes` and `/hero/:id` from the `HeroListComponent` and `HeroDetailComponent` components. If there was a requirement that links to `heroes` become `superheroes`, you still want the previous URLs to navigate correctly. You also don't want to go and update every link in your application, so redirects makes refactoring routes trivial.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你已经设置好了路由，并且用命令式和声明式的方式导航到了很多不同的路由。但是，任何应用的需求都会随着时间而改变。
 								你把链接 `/heroes` 和 `hero/:id` 指向了 `HeroListComponent` 和 `HeroDetailComponent` 组件。
 								如果有这样一个需求，要把链接 `heroes` 变成 `superheroes`，你仍然希望以前的 URL 能正常导航。
 								但你也不想在应用中找到并修改每一个链接，这时候，重定向就可以省去这些琐碎的重构工作。
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
 								{@a url-refactor}
 								### Changing /heroes to /superheroes
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								### 把 `/heroes` 修改为 `/superheros`
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								Let's take the `Hero` routes and migrate them to new URLs. The `Router` checks for redirects in your configuration before navigating, so each redirect is triggered when needed. To support this change, you'll add redirects from the old routes to the new routes in the `heroes-routing.module`.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								先取得 `Hero` 路由，并把它们迁移到新的 URL。`Router`（路由器）会在开始导航之前先在配置中检查所有重定向语句，以便将来按需触发重定向。要支持这种修改，你就要在 `heroes-routing.module` 文件中把老的路由重定向到新的路由。
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	.nvmrc
#	aio/content/cli/index.md
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/app-shell.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bazel.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/build.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/cli-builder.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/complex-animation-sequences.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/creating-libraries.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-navtree.md
#	aio/content/guide/dependency-injection-providers.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/deprecations.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/dynamic-form.md
#	aio/content/guide/elements.md
#	aio/content/guide/entry-components.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/file-structure.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms-overview.md
#	aio/content/guide/forms.md
#	aio/content/guide/frequent-ngmodules.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/ivy.md
#	aio/content/guide/language-service.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/module-types.md
#	aio/content/guide/ngmodule-api.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/providers.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/releases.md
#	aio/content/guide/reusable-animations.md
#	aio/content/guide/route-animations.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/schematics-authoring.md
#	aio/content/guide/schematics-for-libraries.md
#	aio/content/guide/schematics.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-devops.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-local.md
#	aio/content/guide/sharing-ngmodules.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/static-query-migration.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/transition-and-triggers.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade-setup.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/using-libraries.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/web-worker.md
#	aio/content/guide/workspace-config.md
#	aio/content/marketing/events.html
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/content/start/data.md
#	aio/content/start/deployment.md
#	aio/content/start/forms.md
#	aio/content/start/index.md
#	aio/content/start/routing.md
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/app/app.component.spec.ts
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/app/layout/mode-banner/mode-banner.component.ts
#	aio/src/app/layout/nav-item/nav-item.component.html
#	aio/src/app/shared/toc.service.ts
#	aio/src/styles/0-base/_typography.scss
#	aio/src/styles/2-modules/_api-pages.scss
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/yarn.lock
#	packages/common/http/src/headers.ts
#	packages/common/http/src/interceptor.ts
#	packages/common/http/src/params.ts
#	packages/common/http/src/response.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/date_pipe.ts
#	packages/core/src/change_detection/pipe_transform.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/directives.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render3/component_ref.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/form_builder.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/directives/router_outlet.ts
#	packages/router/src/events.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts
#	packages/router/src/shared.ts

											
										
										
											2020-01-11 18:10:12 +08:00
+								<code-example path="router/src/app/heroes/heroes-routing.module.ts" header="src/app/heroes/heroes-routing.module.ts (heroes redirects)"></code-example>
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
 								You'll notice two different types of redirects. The first change is from  `/heroes` to `/superheroes` without any parameters. This is a straightforward redirect, unlike the change from `/hero/:id` to `/superhero/:id`, which includes the `:id` route parameter. Router redirects also use powerful pattern matching, so the `Router` inspects the URL and replaces route parameters in the `path` with their appropriate destination. Previously, you navigated to a URL such as `/hero/15` with a route parameter `id` of `15`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								注意，这里有两种类型的重定向。第一种是不带参数的从 `/heroes` 重定向到 `/superheroes`。这是一种非常直观的重定向。第二种是从 `/hero/:id` 重定向到 `/superhero/:id`，它还要包含一个 `:id` 路由参数。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								路由器重定向时使用强大的模式匹配功能，这样，路由器就会检查 URL，并且把 `path` 中带的路由参数替换成相应的目标形式。以前，你导航到形如 `/hero/15` 的 URL 时，带了一个路由参数 `id`，它的值是 `15`。
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
 								The `Router` also supports [query parameters](#query-parameters) and the [fragment](#fragment) when using redirects.
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
+								在重定向的时候，路由器还支持[查询参数](#query-parameters)和[片段(fragment)](#fragment)。
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								* When using absolute redirects, the `Router` will use the query parameters and the fragment from the redirectTo in the route config.
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   当使用绝对地址重定向时，路由器将会使用路由配置的 `redirectTo` 属性中规定的查询参数和片段。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								* When using relative redirects, the `Router` use the query params and the fragment from the source URL.
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   当使用相对地址重定向时，路由器将会使用源地址（跳转前的地址）中的查询参数和片段。
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								</div>
 								Before updating the `app-routing.module.ts`, you'll need to consider an important rule. Currently, our empty path route redirects to `/heroes`, which redirects to `/superheroes`. This _won't_ work and is by design as the `Router` handles redirects once at each level of routing configuration. This prevents chaining of redirects, which can lead to endless redirect loops.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在修改 `app-routing.module.ts` 之前，你要先考虑一条重要的规则。
 								目前，你把空路径路由重定向到了 `/heroes`，它又被重定向到了 `/superheroes`。这样*不行*，从设计上就不行。
 								因为路由器在每一层的路由配置中只会处理一次重定向。这样可以防止出现无限循环的重定向。
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
+								So instead, you'll update the empty path route in `app-routing.module.ts` to redirect to `/superheroes`.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								所以，你要在 `app-routing.module.ts` 中修改空路径路由，让它重定向到 `/superheroes`。
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app-routing.module.ts" header="src/app/app-routing.module.ts (superheroes redirect)"></code-example>
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								`RouterLink`s aren't tied to route configuration, so you'll need to update the associated router links so they remain active when the new route is active. You'll update the `app.component.ts` template for the `/heroes` routerLink.
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
-												fix: 把遗漏的 我们 替换成 你

											
										
										
											2018-03-23 09:43:02 +08:00
+								由于 `RouterLink` 指令没有关联到路由配置，所以你需要修改相关的路由链接，以便在新的路由激活时，它们也能保持激活状态。你要修改 `app.component.ts` 模板中的 `/heroes` 路由链接。
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.component.html" header="src/app/app.component.html (superheroes active routerLink)"></code-example>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
 								Update the `goToHeroes()` method in the `hero-detail.component.ts` to navigate back to `/superheroes` with the optional route parameters.
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								修改 `hero-detail.component.ts` 中的 `goToHeroes()` 方法，使用可选的路由参数导航回 `/superheroes`。
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/hero-detail/hero-detail.component.ts" region="redirect" header="src/app/heroes/hero-detail/hero-detail.component.ts (goToHeroes)"></code-example>
-												docs(aio): Updated usage of Observables in router guide. Added section for advanced redirects (#18197)

PR Close #18197

											
										
										
											2017-07-16 13:24:33 -05:00
 								With the redirects setup, all previous routes now point to their new destinations and both URLs still function as intended.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								当这些重定向设置好之后，所有以前的路由都指向了它们的新目标，并且每个 URL 也仍然能正常工作。
-												Merge branch 'master' into aio

# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md

											
										
										
											2017-10-01 11:40:31 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a inspect-config}
 								## Inspect the router's configuration
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								## 审查路由器配置
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You put a lot of effort into configuring the router in several routing module files
-												docs: Updated router guide content and examples for paramMap

and queryParamMap, tracing, and incidental improvements.
closes #16991 and #16259 which it also fixes.

											
										
										
											2017-06-18 21:09:02 -05:00
+								and were careful to list them [in the proper order](#routing-module-order).
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Are routes actually evaluated as you planned?
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								How is the router really configured?
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你把大量的精力投入到在一系列路由模块文件里配置路由器上，并且小心的[以合适的顺序](guide/router#routing-module-order)列出它们。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								这些路由是否真的如同你预想的那样执行了？
 								路由器的真实配置是怎样的？
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You can inspect the router's current configuration any time by injecting it and
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								examining its `config` property.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								For example, update the `AppModule` as follows and look in the browser console window
 								to see the finished route configuration.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								通过注入它（Router）并检查它的 `config` 属性，你可以随时审查路由器的当前配置。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								例如，把 `AppModule` 修改为这样，并在浏览器的控制台窗口中查看最终的路由配置。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												Merge remote-tracking branch 'en/master' into aio

# Conflicts:
#	.nvmrc
#	aio/content/cli/index.md
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/app-shell.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bazel.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/build.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/cli-builder.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/complex-animation-sequences.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/creating-libraries.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-navtree.md
#	aio/content/guide/dependency-injection-providers.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/deprecations.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/dynamic-form.md
#	aio/content/guide/elements.md
#	aio/content/guide/entry-components.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/file-structure.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms-overview.md
#	aio/content/guide/forms.md
#	aio/content/guide/frequent-ngmodules.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/ivy.md
#	aio/content/guide/language-service.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/module-types.md
#	aio/content/guide/ngmodule-api.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/providers.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/releases.md
#	aio/content/guide/reusable-animations.md
#	aio/content/guide/route-animations.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/schematics-authoring.md
#	aio/content/guide/schematics-for-libraries.md
#	aio/content/guide/schematics.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-devops.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-local.md
#	aio/content/guide/sharing-ngmodules.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/static-query-migration.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/transition-and-triggers.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade-setup.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/using-libraries.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/web-worker.md
#	aio/content/guide/workspace-config.md
#	aio/content/marketing/events.html
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/content/start/data.md
#	aio/content/start/deployment.md
#	aio/content/start/forms.md
#	aio/content/start/index.md
#	aio/content/start/routing.md
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/app/app.component.spec.ts
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/app/layout/mode-banner/mode-banner.component.ts
#	aio/src/app/layout/nav-item/nav-item.component.html
#	aio/src/app/shared/toc.service.ts
#	aio/src/styles/0-base/_typography.scss
#	aio/src/styles/2-modules/_api-pages.scss
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/yarn.lock
#	packages/common/http/src/headers.ts
#	packages/common/http/src/interceptor.ts
#	packages/common/http/src/params.ts
#	packages/common/http/src/response.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/date_pipe.ts
#	packages/core/src/change_detection/pipe_transform.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/directives.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render3/component_ref.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/form_builder.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/directives/router_outlet.ts
#	packages/router/src/events.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts
#	packages/router/src/shared.ts

											
										
										
											2020-01-11 18:10:12 +08:00
+								<code-example path="router/src/app/app.module.7.ts" header="src/app/app.module.ts (inspect the router config)" region="inspect-config"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a final-app}
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								## Wrap up and final app
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								## 总结与最终的应用
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You've covered a lot of ground in this guide and the application is too big to reprint here.
-												build(aio): migrate plunker to stackblitz (#20165)

PR Close #20165

											
										
										
											2017-11-03 18:08:28 +01:00
+								Please visit the <live-example title="Router Sample in Stackblitz"></live-example>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								where you can download the final source code.
-												fix: 把所有 plunker 替换为 Stackblitz

											
										
										
											2018-03-07 16:15:21 +08:00
+								本章中涉及到了很多背景知识，而且本应用程序也太大了，所以没法在这里显示。请访问<live-example title="Router Sample in Stackblitz"></live-example>，在那里你可以下载最终的源码。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a appendices}
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								## Appendices
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								## 附录
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The balance of this guide is a set of appendices that
 								elaborate some of the points you covered quickly above.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								本章剩下的部分是一组附录，它详尽阐述了那些曾匆匆带过的知识点。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The appendix material isn't essential. Continued reading is for the curious.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								该附件中的内容不是必须的，感兴趣的人才需要阅读它。
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a link-parameters-array}
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): update headers for toc (#16969)


											
										
										
											2017-05-26 21:28:06 +02:00
+								### Appendix: link parameters array
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
-												fix: some untranslated english

											
										
										
											2017-08-06 13:21:34 +08:00
+								### 附录：链接参数数组
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								A link parameters array holds the following ingredients for router navigation:
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								链接参数数组保存路由导航时所需的成分：
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* The *path* of the route to the destination component.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   指向目标组件的那个路由的*路径（path）*
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Required and optional route parameters that go into the route URL.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   必备路由参数和可选路由参数，它们将进入该路由的 URL
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You can bind the `RouterLink` directive to such an array like this:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你可以把 `RouterLink` 指令绑定到一个数组，就像这样：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.component.3.ts" header="src/app/app.component.ts (h-anchor)" region="h-anchor"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								You've written a two element array when specifying a route parameter like this:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								在指定路由参数时，你写过一个双元素的数组，就像这样：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/heroes/hero-list/hero-list.component.1.html" header="src/app/heroes/hero-list/hero-list.component.html (nav-to-detail)" region="nav-to-detail"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You can provide optional route parameters in an object like this:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你可以在对象中提供可选的路由参数，就像这样：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.component.3.ts" header="src/app/app.component.ts (cc-query-params)" region="cc-query-params"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								These three examples cover the need for an app with one level routing.
 								The moment you add a child router, such as the crisis center, you create new link array possibilities.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								这三个例子涵盖了你在单级路由的应用中所需的一切。在你添加一个像*危机中心*一样的子路由时，你可以创建新链接数组。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Recall that you specified a default child route for the crisis center so this simple `RouterLink` is fine.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								回忆一下，你曾为*危机中心*指定过一个默认的子路由，以便能使用这种简单的 `RouterLink`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.component.3.ts" header="src/app/app.component.ts (cc-anchor-w-default)" region="cc-anchor-w-default"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Parse it out.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								分解一下。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* The first item in the array identifies the parent route (`/crisis-center`).
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   数组中的第一个条目标记出了父路由(`/crisis-center`)。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* There are no parameters for this parent route so you're done with it.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   这个父路由没有参数，因此这步已经完成了。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* There is no default for the child route so you need to pick one.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								   没有默认的子路由，因此你得选取一个。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* You're navigating to the `CrisisListComponent`, whose route path is `/`, but you don't need to explicitly add the slash.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								   你决定跳转到 `CrisisListComponent`，它的路由路径是'/'，但你不用显式的添加它。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								* Voilà! `['/crisis-center']`.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   哇！`['/crisis-center']`。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(aio): move content-related images to `content/images/`

											
										
										
											2017-04-26 15:11:02 +03:00
+								Take it a step further. Consider the following router link that
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								navigates from the root of the application down to the *Dragon Crisis*:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								更进一步。这次要构建一个从根组件往下导航到“巨龙危机”时的链接参数数组：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.component.3.ts" header="src/app/app.component.ts (Dragon-anchor)" region="Dragon-anchor"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* The first item in the array identifies the parent route (`/crisis-center`).
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 人工修订自动翻译
fix: 标准化原文中的异常语句

											
										
										
											2018-03-07 13:28:58 +08:00
+								   数组中的第一个条目标记出了父路由(`/crisis-center`)。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* There are no parameters for this parent route so you're done with it.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   这个父路由没有参数，因此这步已经完成了。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* The second item identifies the child route details about a particular crisis (`/:id`).
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   数组中的第二个条目（'/:id'）用来标记出到指定危机的详情页的子路由。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* The details child route requires an `id` route parameter.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   详细的子路由需要一个 `id` 路由参数。
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								* You added the `id` of the *Dragon Crisis* as the second item in the array (`1`).
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								   你把*巨龙危机*的 `id` 添加为该数组中的第二个条目（`1`）。
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								* The resulting path is `/crisis-center/1`.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   最终生成的路径是 `/crisis-center/1`。
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								If you wanted to, you could redefine the `AppComponent` template with *Crisis Center* routes exclusively:
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								只要想，你也可以用*危机中心*路由单独重定义 `AppComponent` 的模板：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.component.3.ts" header="src/app/app.component.ts (template)" region="template"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								In sum, you can write applications with one, two or more levels of routing.
 								The link parameters array affords the flexibility to represent any routing depth and
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								any legal sequence of route paths, (required) router parameters, and (optional) route parameter objects.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								总结：你可以用一级、两级或多级路由来写应用程序。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								  链接参数数组提供了用来表示任意深度路由的链接参数数组以及任意合法的路由参数序列、必须的路由器参数以及可选的路由参数对象。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								{@a browser-url-styles}
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								{@a location-strategy}
-												docs(aio): update headers for toc (#16969)


											
										
										
											2017-05-26 21:28:06 +02:00
+								### Appendix: *LocationStrategy* and browser URL styles
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:15:36 +08:00
+								### 附录：*LocationStrategy* 以及浏览器 URL 样式
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								When the router navigates to a new component view, it updates the browser's location and history
 								with a URL for that view.
 								This is a strictly local URL. The browser shouldn't send this URL to the server
 								and should not reload the page.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								当路由器导航到一个新的组件视图时，它会用该视图的 URL 来更新浏览器的当前地址以及历史。
 								严格来说，这个 URL 其实是本地的，浏览器不会把该 URL 发给服务器，并且不会重新加载此页面。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Modern HTML5 browsers support
-												docs(aio): remove _blank target (#16205)


											
										
										
											2017-04-24 20:23:45 +02:00
+								<a href="https://developer.mozilla.org/en-US/docs/Web/API/History_API#Adding_and_modifying_history_entries" title="HTML5 browser history push-state">history.pushState</a>,
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								a technique that changes a browser's location and history without triggering a server page request.
 								The router can compose a "natural" URL that is indistinguishable from
 								one that would otherwise require a page load.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								现代 HTML 5 浏览器支持[history.pushState](https://developer.mozilla.org/en-US/docs/Web/API/History_API#Adding_and_modifying_history_entries) API，
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								这是一项可以改变浏览器的当前地址和历史，却又不会触发服务端页面请求的技术。
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								路由器可以合成出一个“自然的”URL，它看起来和那些需要进行页面加载的 URL 没什么区别。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Here's the *Crisis Center* URL in this "HTML5 pushState" style:
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								下面是*危机中心*的 URL 在“HTML 5 pushState”风格下的样子：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								<code-example format="nocode">
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
+								  localhost:3002/crisis-center/
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								</code-example>
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Older browsers send page requests to the server when the location URL changes
 								_unless_ the change occurs after a "#" (called the "hash").
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Routers can take advantage of this exception by composing in-application route
-												docs: remove redundant whitespaces and fix minor typos (#33422)

PR Close #33422

											
										
										
											2019-10-26 21:35:03 +07:00
+								URLs with hashes. Here's a "hash URL" that routes to the *Crisis Center*.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								老旧的浏览器在当前地址的 URL 变化时总会往服务器发送页面请求……唯一的例外规则是：当这些变化位于“#”（被称为“hash”）后面时不会发送。通过把应用内的路由 URL 拼接在 `#` 之后，路由器可以获得这条“例外规则”带来的优点。下面是到*危机中心*路由的“hash URL”：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								<code-example format="nocode">
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
+								  localhost:3002/src/#/crisis-center/
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								</code-example>
 								The router supports both styles with two `LocationStrategy` providers:
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								路由器通过两种 `LocationStrategy` 提供商来支持所有这些风格：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+. `PathLocationStrategy`&mdash;the default "HTML5 pushState" style.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   `PathLocationStrategy` - 默认的策略，支持“HTML 5 pushState”风格。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+. `HashLocationStrategy`&mdash;the "hash URL" style.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   `HashLocationStrategy` - 支持“hash URL”风格。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								The `RouterModule.forRoot()` function sets the `LocationStrategy` to the `PathLocationStrategy`,
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								making it the default strategy.
 								You can switch to the `HashLocationStrategy` with an override during the bootstrapping process if you prefer it.
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								`RouterModule.forRoot()` 函数把 `LocationStrategy` 设置成了 `PathLocationStrategy`，使其成为了默认策略。
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你可以在启动过程中改写（override）它，来切换到 `HashLocationStrategy` 风格 —— 如果你更喜欢这种。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): cleanup aalert, callout, subsection use and author style (#24986)

PR Close #24986

											
										
										
											2018-07-19 15:00:08 -07:00
+								<div class="alert is-helpful">
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Learn about providers and the bootstrap process in the
-												build(aio): new migration

											
										
										
											2017-04-01 01:57:13 +02:00
+								[Dependency Injection guide](guide/dependency-injection#bootstrap).
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								要学习关于“提供商”和启动过程的更多知识，参见[依赖注入](guide/dependency-injection#bootstrap)一章。
-												docs(aio): update to remark syntax

											
										
										
											2017-04-10 16:51:13 +01:00
+								</div>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): update headers for toc (#16969)


											
										
										
											2017-05-26 21:28:06 +02:00
+								#### Which strategy is best?
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: some untranslated english

											
										
										
											2017-08-06 13:21:34 +08:00
+								#### 哪种策略更好？
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You must choose a strategy and you need to make the right call early in the project.
 								It won't be easy to change later once the application is in production
 								and there are lots of application URL references in the wild.
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								你必须选择一种策略，并且在项目的早期就这么干。一旦该应用进入了生产阶段，要改起来可就不容易了，因为外面已经有了大量对应用 URL 的引用。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Almost all Angular projects should use the default HTML5 style.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								It produces URLs that are easier for users to understand.
 								And it preserves the option to do _server-side rendering_ later.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								几乎所有的 Angular 项目都会使用默认的 HTML 5 风格。它生成的 URL 更易于被用户理解，它也为将来做**服务端渲染**预留了空间。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Rendering critical pages on the server is a technique that can greatly improve
 								perceived responsiveness when the app first loads.
 								An app that would otherwise take ten or more seconds to start
 								could be rendered on the server and delivered to the user's device
 								in less than a second.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								在服务器端渲染指定的页面，是一项可以在该应用首次加载时大幅提升响应速度的技术。那些原本需要十秒甚至更长时间加载的应用，可以预先在服务端渲染好，并在少于一秒的时间内完整呈现在用户的设备上。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								This option is only available if application URLs look like normal web URLs
 								without hashes (#) in the middle.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								只有当应用的 URL 看起来像是标准的 Web URL，中间没有 hash（#）时，这个选项才能生效。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Stick with the default unless you have a compelling reason to
 								resort to hash routes.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								除非你有强烈的理由不得不使用 hash 路由，否则就应该坚决使用默认的 HTML 5 路由风格。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
 								#### The *&lt;base href>*
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								#### *&lt;base href>* 标签
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								The router uses the browser's
 								<a href="https://developer.mozilla.org/en-US/docs/Web/API/History_API#Adding_and_modifying_history_entries" title="HTML5 browser history push-state">history.pushState</a>
 								for navigation. Thanks to `pushState`, you can make in-app URL paths look the way you want them to
 								look, e.g. `localhost:4200/crisis-center`. The in-app URLs can be indistinguishable from server URLs.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								路由器使用浏览器的 <a href="https://developer.mozilla.org/en-US/docs/Web/API/History_API#Adding_and_modifying_history_entries" title="HTML5 browser history push-state">history.pushState</a> API 进行导航。借助 `pushState` 你可以让应用中的 URL 路径看上去就像你期望的那样，比如 `localhost:4200/crisis-center`，应用内的 URL 和服务器的 URL 没有区别。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Modern HTML5 browsers were the first to support `pushState` which is why many people refer to these URLs as
 								"HTML5 style" URLs.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								现代的 HTML5 浏览器都支持 `pushState`，这也就是为什么很多人把这种 URL 形式称为 "HTML 5" 风格的 URL。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
 								<div class="alert is-helpful">
 								HTML5 style navigation is the router default.
 								In the [LocationStrategy and browser URL styles](#browser-url-styles) Appendix,
 								learn why HTML5 style is preferred, how to adjust its behavior, and how to switch to the
 								older hash (#) style, if necessary.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								路由器默认使用 HTML5 风格的导航。
 								在附录中的 [LocationStrategy 与浏览器 URL 风格](#browser-url-styles)中，你可以了解为何推荐使用 HTML5 风格的 URL，如何调整其行为，以及必要时如何切换到老式的 hash（#）风格。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								</div>
 								You must **add a
 								<a href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base" title="base href">&lt;base href&gt; element</a>**
 								to the app's `index.html` for `pushState` routing to work.
 								The browser uses the `<base href>` value to prefix *relative* URLs when referencing
 								CSS files, scripts, and images.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								你必须在应用的 `index.html` 中**添加一个 <a href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base" title="base href">&lt;base href&gt; 元素</a>**才能让 `pushState` 路由正常工作。
 								浏览器要用 `<base href>` 的值为引用 CSS、脚本和图片文件时使用的*相对* URL 添加前缀。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
+								Add the `<base>` element just after the  `<head>` tag.
 								If the `app` folder is the application root, as it is for this application,
 								set the `href` value in **`index.html`** *exactly* as shown here.
-												docs: 手动解决冲突

											
										
										
											2018-10-21 17:44:10 +08:00
+								请把 `<base>` 元素添加在 `<head>` 标签的紧后面。如果应用的根目录是 `app` 目录，那么就可以像这个应用程序一样，设置 **`index.html`** 中的 `href` 值。代码如下。
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/index.html" header="src/index.html (base-href)" region="base-href"></code-example>
-												docs: Update router guide to use Angular CLI (#20023)

PR Close #20023

											
										
										
											2017-10-23 08:11:51 -05:00
-												docs(aio): update headers for toc (#16969)


											
										
										
											2017-05-26 21:28:06 +02:00
+								#### HTML5 URLs and the  *&lt;base href>*
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								#### HTML 5 URL 与*&lt;base href>*
-												fix: 文字微调

											
										
										
											2017-10-12 17:51:55 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								While the router uses the
 								<a href="https://developer.mozilla.org/en-US/docs/Web/API/History_API#Adding_and_modifying_history_entries" title="Browser history push-state">HTML5 pushState</a>
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								style by default, you *must* configure that strategy with a **base href**.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: 把除了 upgrading 之外的 我们 都替换成了 你
fix: 翻译了一部分 AOT Compiler

											
										
										
											2018-03-22 17:18:48 +08:00
+								由于路由器默认使用“<a href="https://developer.mozilla.org/en-US/docs/Web/API/History_API#Adding_and_modifying_history_entries" target="_blank" title="Browser history push-state">HTML 5 pushState</a>”风格，所以你*必须*用一个**base href**来配置该策略（Strategy）。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								The preferred way to configure the strategy is to add a
-												docs(aio): remove _blank target (#16205)


											
										
										
											2017-04-24 20:23:45 +02:00
+								<a href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base" title="base href">&lt;base href&gt; element</a>
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								tag in the `<head>` of the `index.html`.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								配置该策略的首选方式是往 `index.html` 的 `<head>` 中添加一个[&lt;base href> element](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base)标签。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/index.html" header="src/index.html (base-href)" region="base-href"></code-example>
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Without that tag, the browser may not be able to load resources
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								(images, CSS, scripts) when "deep linking" into the app.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Bad things could happen when someone pastes an application link into the
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								browser's address bar or clicks such a link in an email.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
+								如果没有此标签，当通过“深链接”进入该应用时，浏览器就不能加载资源（图片、CSS、脚本）。如果有人把应用的链接粘贴进浏览器的地址栏或从邮件中点击应用的链接时，这种问题就发生。
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								Some developers may not be able to add the `<base>` element, perhaps because they don't have
 								access to `<head>` or the `index.html`.
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								有些开发人员可能无法添加 `<base>` 元素，这可能是因为它们没有访问 `<head>` 或 `index.html` 的权限。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+								Those developers may still use HTML5 URLs by taking two remedial steps:
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								它们仍然可以使用 HTML 5 格式的 URL，但要采取两个步骤进行补救：
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+. Provide the router with an appropriate [APP_BASE_HREF][] value.
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												fix: 修正最后一版的全部翻译

											
										
										
											2018-03-03 21:06:01 +08:00
+								   用适当的[APP_BASE_HREF][]值提供（provide）路由器。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): move cookbooks into guide

Also update all docs with migrated versions from latest angular.io

Fixes #14941

											
										
										
											2017-03-11 13:44:25 +00:00
+. Use _root URLs_ for all web resources: CSS, images, scripts, and template HTML files.
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												feat: 自动在中英文之间添加空格，以改善排版

											
										
										
											2018-03-20 17:09:18 +08:00
+								   对所有 Web 资源使用**绝对地址**：CSS、图片、脚本、模板 HTML。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): fix lots of broken links

Closes #16317

											
										
										
											2017-04-30 22:10:32 +02:00
+								{@a hashlocationstrategy}
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												docs(aio): update headers for toc (#16969)


											
										
										
											2017-05-26 21:28:06 +02:00
+								#### *HashLocationStrategy*
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
-												fix: translate all pure english titles

											
										
										
											2017-08-04 14:06:15 +08:00
+								#### *HashLocationStrategy* 策略
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								You can go old-school with the `HashLocationStrategy` by
-												docs: remove coremodule references (#28434)

PR Close #28434

											
										
										
											2019-01-22 14:11:35 -05:00
+								providing the `useHash: true` in an object as the second argument of the `RouterModule.forRoot()`
-												docs(aio): migrate content docs from angular.io

This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator

											
										
										
											2017-02-22 18:09:39 +00:00
+								in the `AppModule`.
-												docs(aio): update migrated content from anguar.io

											
										
										
											2017-03-27 16:08:53 +01:00
-												fix: 修订完了 guide 部分

											
										
										
											2019-06-04 21:48:02 +08:00
+								你可以在根模块的 `RouterModule.forRoot()` 的第二个参数中传入一个带有 `useHash: true` 的对象，以回到基于 `HashLocationStrategy` 的传统方式。
-												docs(aio): merge latest chinese translations

											
										
										
											2017-07-23 11:51:25 +08:00
-												refactor(docs-infra): remove `linenums=false` since it is now the default (#31674)

PR Close #31674

											
										
										
											2019-07-20 20:40:17 +03:00
+								<code-example path="router/src/app/app.module.6.ts" header="src/app/app.module.ts (hash URL strategy)"></code-example>