合并最新版本

解决错误格式化导致的无法加载源文件问题
2017-06-01 21:23:32 +08:00 · 2017-06-01 21:23:32 +08:00 · fa4730c72c
parent 53e50f64cf
commit fa4730c72c
2 changed files with 85 additions and 85 deletions
--- a/public/docs/ts/latest/guide/_data.json
+++ b/public/docs/ts/latest/guide/_data.json
@ -200,5 +200,5 @@
  "webpack": {
    "title": "Webpack 简介",
    "intro": "使用基于 Webpack 的工具创建 Angular 应用"
-  },
+  }
 }
--- a/public/docs/ts/latest/guide/router.jade
+++ b/public/docs/ts/latest/guide/router.jade
@ -1424,21 +1424,21 @@ a#redirect
  下面是当前里程碑中讨论过的文件列表：

 +makeTabs(
-`router/ts/src/app/app.component.1.ts,
-router / ts / src / app / app.module.1.ts,
-router / ts / src / main.ts,
-router / ts / src / app / hero - list.component.ts,
-router / ts / src / app / crisis - list.component.ts,
-router / ts / src / app / not - found.component.ts,
-router / ts / src / index.html`,
-',,,,',
-`app.component.ts,
-app.module.ts,
-main.ts,
-hero - list.component.ts,
-crisis - list.component.ts,
-not - found.component.ts,
-index.html`)
+  `router/ts/src/app/app.component.1.ts,
+  router/ts/src/app/app.module.1.ts,
+  router/ts/src/main.ts,
+  router/ts/src/app/hero-list.component.ts,
+  router/ts/src/app/crisis-list.component.ts,
+  router/ts/src/app/not-found.component.ts,
+  router/ts/src/index.html`,
+  ',,,,',
+  `app.component.ts,
+  app.module.ts,
+  main.ts,
+  hero-list.component.ts,
+  crisis-list.component.ts,
+  not-found.component.ts,
+  index.html`)

 .l-main-section#routing-module
 :marked
@ -2734,23 +2734,23 @@ a#milestone-3-wrap-up
  这里是当前版本的范例程序相关文件。

 +makeTabs(
-`router/ts/src/app/app.component.1.ts,
-router / ts / src / app / app.module.3.ts,
-router / ts / src / app / app - routing.module.2.ts,
-router / ts / src / app / heroes / hero - list.component.ts,
-router / ts / src / app / heroes / hero - detail.component.ts,
-router / ts / src / app / heroes / hero.service.ts,
-router / ts / src / app / heroes / heroes.module.ts,
-router / ts / src / app / heroes / heroes - routing.module.ts`,
-'',
-`app.component.ts,
-app.module.ts,
-app - routing.module.ts,
-hero - list.component.ts,
-hero - detail.component.ts,
-hero.service.ts,
-heroes.module.ts,
-heroes - routing.module.ts`)
+  `router/ts/src/app/app.component.1.ts,
+  router/ts/src/app/app.module.3.ts,
+  router/ts/src/app/app-routing.module.2.ts,
+  router/ts/src/app/heroes/hero-list.component.ts,
+  router/ts/src/app/heroes/hero-detail.component.ts,
+  router/ts/src/app/heroes/hero.service.ts,
+  router/ts/src/app/heroes/heroes.module.ts,
+  router/ts/src/app/heroes/heroes-routing.module.ts`,
+  '',
+  `app.component.ts,
+  app.module.ts,
+  app-routing.module.ts,
+  hero-list.component.ts,
+  hero-detail.component.ts,
+  hero.service.ts,
+  heroes.module.ts,
+  heroes-routing.module.ts`)

 a#milestone-4
 .l-main-section
@ -3221,11 +3221,11 @@ figure.image-display
  下面是该组件及其模板：

 +makeTabs(
-`router/ts/src/app/compose-message.component.ts,
-router / ts / src / app / compose - message.component.html`,
-null,
-`src/app/compose-message.component.ts,
-src / app / compose - message.component.html`)
+  `router/ts/src/app/compose-message.component.ts,
+  router/ts/src/app/compose-message.component.html`,
+  null,
+  `src/app/compose-message.component.ts,
+  src/app/compose-message.component.html`)

 :marked
  It looks about the same as any other component you've seen in this guide.
@ -3597,18 +3597,18 @@ a#can-activate-guard
  管理特性模块包含`AdminComponent`，它用于在特性模块内的仪表盘路由以及两个尚未完成的用于管理危机和英雄的组件之间进行路由。

 +makeTabs(
-`router/ts/src/app/admin/admin-dashboard.component.1.ts,
-router / ts / src / app / admin / admin.component.ts,
-router / ts / src / app / admin / admin.module.ts,
-router / ts / src / app / admin / manage - crises.component.ts,
-router / ts / src / app / admin / manage - heroes.component.ts
+  `router/ts/src/app/admin/admin-dashboard.component.1.ts,
+  router/ts/src/app/admin/admin.component.ts,
+  router/ts/src/app/admin/admin.module.ts,
+  router/ts/src/app/admin/manage-crises.component.ts,
+  router/ts/src/app/admin/manage-heroes.component.ts
  `,
-null,
-`src/app/admin/admin-dashboard.component.ts,
-src / app / admin / admin.component.ts,
-src / app / admin / admin.module.ts,
-src / app / admin / manage - crises.component.ts,
-src / app / admin / manage - heroes.component.ts
+  null,
+  `src/app/admin/admin-dashboard.component.ts,
+  src/app/admin/admin.component.ts,
+  src/app/admin/admin.module.ts,
+  src/app/admin/manage-crises.component.ts,
+  src/app/admin/manage-heroes.component.ts
  `)

 .l-sub-section
@ -3797,14 +3797,14 @@ a#add-login-component
  同时在`AppModule`中导入并添加`LoginRoutingModule`。

 +makeTabs(
-`router/ts/src/app/app.module.ts,
-router / ts / src / app / login.component.1.ts,
-router / ts / src / app / login - routing.module.ts
+  `router/ts/src/app/app.module.ts,
+  router/ts/src/app/login.component.1.ts,
+  router/ts/src/app/login-routing.module.ts
  `,
-null,
-`src/app/app.module.ts,
-src / app / login.component.ts,
-src / app / login - routing.module.ts
+  null,
+  `src/app/app.module.ts,
+  src/app/login.component.ts,
+  src/app/login-routing.module.ts
  `)

 .l-sub-section
@ -4166,33 +4166,33 @@ a#fetch-before-navigating
  本里程碑中与*危机中心*有关的代码如下：

 +makeTabs(
-`router/ts/src/app/app.component.ts,
-router / ts / src / app / crisis - center / crisis - center - home.component.ts,
-router / ts / src / app / crisis - center / crisis - center.component.ts,
-router / ts / src / app / crisis - center / crisis - center - routing.module.4.ts,
-router / ts / src / app / crisis - center / crisis - list.component.ts,
-router / ts / src / app / crisis - center / crisis - detail.component.ts,
-router / ts / src / app / crisis - center / crisis - detail - resolver.service.ts,
-router / ts / src / app / crisis - center / crisis.service.ts
+  `router/ts/src/app/app.component.ts,
+  router/ts/src/app/crisis-center/crisis-center-home.component.ts,
+  router/ts/src/app/crisis-center/crisis-center.component.ts,
+  router/ts/src/app/crisis-center/crisis-center-routing.module.4.ts,
+  router/ts/src/app/crisis-center/crisis-list.component.ts,
+  router/ts/src/app/crisis-center/crisis-detail.component.ts,
+  router/ts/src/app/crisis-center/crisis-detail-resolver.service.ts,
+  router/ts/src/app/crisis-center/crisis.service.ts
  `,
-null,
-`app.component.ts,
-crisis - center - home.component.ts,
-crisis - center.component.ts,
-crisis - center - routing.module.ts,
-crisis - list.component.ts,
-crisis - detail.component.ts,
-crisis - detail - resolver.service.ts,
-crisis.service.ts
+  null,
+  `app.component.ts,
+  crisis-center-home.component.ts,
+  crisis-center.component.ts,
+  crisis-center-routing.module.ts,
+  crisis-list.component.ts,
+  crisis-detail.component.ts,
+  crisis-detail-resolver.service.ts,
+  crisis.service.ts
  `)

 +makeTabs(
-`router/ts/src/app/auth-guard.service.3.ts,
-router / ts / src / app / can - deactivate - guard.service.ts
+  `router/ts/src/app/auth-guard.service.3.ts,
+  router/ts/src/app/can-deactivate-guard.service.ts
  `,
-null,
-`auth-guard.service.ts,
-can - deactivate - guard.service.ts
+  null,
+  `auth-guard.service.ts,
+  can-deactivate-guard.service.ts
  `)

 a#query-parameters
@ -4556,14 +4556,14 @@ a#lazy-load-crisis-center
  下面是打开预加载之前的模块修改版：

 +makeTabs(
-`router/ts/src/app/app.module.ts,
-router / ts / src / app / app - routing.module.6.ts,
-router / ts / src / app / crisis - center / crisis - center - routing.module.ts
+  `router/ts/src/app/app.module.ts,
+  router/ts/src/app/app-routing.module.6.ts,
+  router/ts/src/app/crisis-center/crisis-center-routing.module.ts
  `,
-',preload-v1,',
-`app.module.ts,
-app - routing.module.ts,
-crisis - center - routing.module.ts
+  ',preload-v1,',
+  `app.module.ts,
+  app-routing.module.ts,
+  crisis-center-routing.module.ts
  `)
 :marked
  You could try this now and confirm that the  `CrisisCenterModule` loads after you click the "Crisis Center" button.