Commit Graph

380 Commits

Author SHA1 Message Date
Chris Sherman b64ec8275a docs(toh-pt5): fix typo (#2836) 2016-11-21 11:27:09 +01:00
Yang Lin f67aee12a9 Polish by review 2016-11-21 00:39:46 +08:00
Yang Lin 54e9048e46 Revert "Polish by review"
This reverts commit bf4e0c49ff.
2016-11-21 00:30:05 +08:00
Yang Lin bf4e0c49ff Polish by review 2016-11-21 00:22:25 +08:00
Patrice Chalin e0aecb39d9 docs(struct-directives): update Dart cache (#2806)
Only minor prose edits in this PR. No net change in the generated HTML
for the TS side.
2016-11-15 15:38:02 -08:00
Patrice Chalin 0dfda08306 docs: in links use href=foo#bar not foo#!#bar (#2807) 2016-11-15 15:36:34 -08:00
Brandon Roberts 1afe5dc97d docs(router): Updated usage of observables in router tutorial and developer guide
Moved route configuration into separate variable for consistency
Added async pipe to handle subscriptions for list items
2016-11-14 11:05:29 -08:00
Patrice Chalin c12d75a477 remove redundant headings 2016-11-14 05:23:35 -08:00
Rex 763b1c7566 Merge pull request #115 from todoubaba/toh-pt6
Polish toh pt6
2016-11-13 19:14:45 +00:00
rexebin c748e151c8 fix: #119 2016-11-13 19:06:09 +00:00
Patrice Chalin c24dd074a6 docs(toh-5/dart): use routerLink in dashboard (#2744)
* docs(toh-5/dart): use routerLink in dashboard

* minor edits to TS jade

* remove dart/toh-pt5 from bad-code-excerpt-skip-patterns
2016-11-08 14:48:03 -08:00
Yang Lin 6c9b27996c Polish toh pt6 2016-11-06 19:18:18 +08:00
Yang Lin af0359d199 控制台 -> 仪表盘 2016-11-06 16:33:53 +08:00
Yang Lin cf42e8ce7b Promise -> 承诺 2016-11-06 16:33:53 +08:00
Yang Lin b9e72506af Polish toh pt4 2016-11-06 16:33:53 +08:00
Yang Lin ba8503d9b1 typo 2016-11-06 15:17:58 +08:00
Yang Lin a934b5993a Polish toh pt5 2016-11-06 15:08:57 +08:00
Yang Lin 48fca7a8db polish 2016-11-06 11:43:36 +08:00
Yang Lin a13f19f7d4 Polish top pt1 2016-11-06 11:43:36 +08:00
Yang Lin 1cd0742230 more polish 2016-11-06 11:41:49 +08:00
Yang Lin 1586163b0d Polish top pt2 2016-11-06 11:41:49 +08:00
Yang Lin 14eed65c12 Polish toh pt3 2016-11-06 09:41:03 +08:00
Yang Lin b2e92e4a62 polish 2016-11-06 09:30:21 +08:00
Yang Lin 9c799a4f41 Tutorial index 2016-11-06 09:30:21 +08:00
rexebin 48dd29e0d5 patch: toh-pt5 2016-11-05 14:48:20 +00:00
rexebin 7d5e2cf412 Merge remote-tracking branch 'angular.io/master' into merge-review-rex
# Conflicts:
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-11-05 14:08:21 +00:00
Ward Bell fa99a8b0b2 docs(toh-5): dashboard uses [routerLink] bindings #998 (#2718)
* docs(toh-5): dashboard uses [routerLink] bindings #998
closes #998

* chore: temp add toh-5 to bad-code-excerpt-skip-patterns.txt
2016-11-03 10:25:01 -07:00
Zhimin YE 23984f8caf fix few compiling errors(live examples) 2016-11-03 15:52:05 +00:00
Zhimin YE 4578087fa5 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	README.md
#	harp.json
#	public/_includes/_hero-home.jade
#	public/docs/_examples/quickstart/ts/systemjs.config.1.js
#	public/docs/dart/latest/_util-fns.jade
#	public/docs/dart/latest/api/_data.json
#	public/docs/dart/latest/api/index.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/change-log.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade

Server Communication and Visual studio 2015 require further merging.
2016-11-03 15:38:23 +00:00
katerberg db1df77571 Fixes typo in Router tutorial (#2688) 2016-10-31 00:49:14 -07:00
Samuel Marks c746c732aa Typo fix (#2657)
Technically 'nestled' still makes sense in this context, but is a little too Christmas-y! - I assume you meant 'nested' :P
2016-10-23 00:52:12 -07:00
Filipe Silva 0d49fecd30 chore: update to @types (#1872)
* chore: update examples to @types
* fix toh-6 aot and add types link
2016-10-20 17:01:16 -07:00
Zhimin YE fb4aa6a7a0 fix: #97 2016-10-19 11:06:26 +01:00
Zhimin YE 7fc3e00002 fix: #97 2016-10-19 11:05:10 +01:00
Maurice de Beijer e89ba6f075 docs(toh-5): fix typo in link (#2622)
.htm => .html
2016-10-18 15:14:09 +02:00
Zhimin YE f6d2b39844 fix: toh-pt5 2016-10-18 11:58:43 +01:00
rexebin ce3930b2c0 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	harp.json
#	public/_includes/_hero-home.jade
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/quickstart/js/package.1.json
#	public/docs/_includes/_side-nav.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/api/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/rc4-to-rc5.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-10-17 22:48:18 +01:00
Rex 606c656f1b fix: #95 2016-10-17 15:22:23 +01:00
Sebastián Ramírez 883a29ecf7 Fix minor typo in HTTP guide (#2604) 2016-10-14 12:35:28 +02:00
Jesús Rodríguez e503efe8c8 docs(toh5): add moduleId information (#2597) 2016-10-13 16:41:57 -07:00
Sebastián Ramírez 4f81a7ee8c docs(toh5): update styles.css link (#2601) 2016-10-14 01:12:06 +02:00
Ward Bell 2e17d587de docs(toh-5): add AppRoutingModule (#2584) 2016-10-11 16:30:30 -07:00
SangKa 2751b20aae 修正 教程 7.Http 翻译问题 2016-10-10 06:53:40 +08:00
Brandon ff118810ff docs(router): Updated routing examples to use routing modules (#2478)
Simplified routing in tutorial example

Updated ngmodule guide and ngmodule faq with routing module prose
2016-10-05 14:59:09 -07:00
Zhimin YE (Rex) b6ff278ac5 fix: #86 2016-10-03 10:26:22 +01:00
Zhimin YE (Rex) 1523fedcf0 Merge remote-tracking branch 'origin/master' 2016-09-26 15:15:09 +01:00
Zhimin YE (Rex) a18aa9ec01 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-09-26 15:14:39 +01:00
zhibinr 47b3b3dbba 修复格式错误 2016-09-26 11:13:10 +08:00
Brandon 556e40695a docs(toh): Replaced window.history with location service (#2439) 2016-09-25 18:56:12 -07:00
Ward Bell 6def9505cc chore: convert templateUrls to use moduleId where possible. (#2477) 2016-09-25 18:51:54 -07:00
rexebin f7c60a07df fix: change all 他 > 它 2016-09-25 19:50:45 +01:00
rexebin d9af771f8d Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/_includes/_ts-temp.jade
#	public/docs/index.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/index.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/index.jade
#	public/support.jade
2016-09-23 22:13:02 +01:00
Patrice Chalin b2c6acf1ad docs(tutorial): fix broken link (#2420)
Fixes #2419
2016-09-20 10:56:38 -07:00
Jesús Rodríguez 693f6ae462 chore: rename Angular 2 to simply Angular (#2402) 2016-09-19 20:24:40 -07:00
Patrice Chalin e016f3f31e docs(tutorial): don't use shredder for intro page (#2388)
An initial multilang cleanup for ng2.io
2016-09-19 16:56:17 -07:00
Zhimin YE (Rex) 054d25cefe fix: toh-pt6 and embeded live example in ngmodule. 2016-09-19 14:48:05 +01:00
Zhimin YE (Rex) 6aeb8efaa3 fix: live example localisation. 2016-09-19 10:03:53 +01:00
Zhimin YE (Rex) 94d48f2b95 fix: toh1 and 2 2016-09-19 10:00:09 +01:00
John Papa 159b196baf docs(toh): fix spelling of ActivateRoute to ActivatedRoute (#2400)
* fixed spelling of ActivateRoute to ActivatedRoute

* dont do cache
2016-09-18 18:34:32 +02:00
Zhicheng Wang 6f6f89ed9c 把所有“内建”改为“内置” 2016-09-17 11:46:17 +08:00
Zhicheng Wang e693d35fb1 合并了最新更新,翻译了官方的发布声明 2016-09-15 17:08:17 +08:00
Zhicheng Wang 2a1c3626c5 去掉了大部分儿化音
感谢来自github的iloveyo123u1和Elderry
2016-09-12 08:35:02 +08:00
Zhicheng Wang 1a45c1f8fc 更正中文社区的阿泽指出的错误 2016-09-11 09:35:54 +08:00
Zhicheng Wang 8a7165acf5 对上次的合并查漏补缺 2016-09-10 20:44:57 +08:00
Zhicheng Wang 969da7d321 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/homepage-hello-world/ts/index.1.html
#	public/docs/_examples/homepage-tabs/ts/index.1.html
#	public/docs/_examples/homepage-todo/ts/index.1.html
#	public/docs/_examples/systemjs.config.plunker.build.js
#	public/docs/_examples/systemjs.config.plunker.js
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/features.jade
#	public/resources/js/directives/live-example.js
#	tools/plunker-builder/indexHtmlTranslator.js
2016-09-08 17:20:01 +08:00
Ward Bell 6ff9e1a5c1 docs(toh-6): missing create instruction (#2264)
fixes #2231
also addresses `<h1>` issue raised in PR #2256
2016-09-03 13:46:27 -07:00
Patrice Chalin 907f848c95 docs(toh-6): refactoring of 'add, edit, delete heroes' (#2170)
* docs(toh-6/dart): refactoring of 'add, edit, delete heroes'

Refactoring of "add, edit, delete heroes" section of toh-6 from one big
bottom-up step into small independent feature slices, where the user
achieves a "milesone" (i.e., can run the full app) after each feature
section. The section rewrite is shorter and offers a better UX.

Other simplifications:
- Error handling is consistent: in the hero service we log to the
console, everwhere else we just let errors bubble up.
- Hero service methods renamed based on function (create, update)
rather then lower-level implementation (post, put).
- @Output properties have been eliminated (since they weren't
explained).

E2E tests now pass on both the TS and Dart sides.

* docs(toh-6/ts): refactoring of 'add, edit, delete heroes'

Refactoring of "add, edit, delete heroes" section of toh-6 from one big
bottom-up step into small independent feature slices, where the user
achieves a "milesone" (i.e., can run the full app) after each feature
section. The section rewrite is shorter and offers a better UX.

Other simplifications:
- Error handling is consistent: in the hero service we log to the
console, everwhere else we just let errors bubble up.
- Hero service methods renamed based on function (create, update)
rather then lower-level implementation (post, put).
- @Output properties have been eliminated (since they weren't
explained).

E2E tests now pass on both the TS and Dart sides.

Post-Dart-review updates included.

* docs(toh-6): ward tweaks
2016-08-26 14:57:45 -07:00
Zhimin YE (Rex) 373ba06e05 fix: toh-pt5 2016-08-24 14:25:47 +01:00
Zhimin YE (Rex) c26d6a87a0 fixed: toh-pt6 2016-08-24 14:11:32 +01:00
Zhimin YE (Rex) 4fe7e24f16 fix: web API to Web API 2016-08-24 10:23:22 +01:00
Zhimin YE (Rex) e1d5af61d2 fix: toh-p5 and p6. 2016-08-23 15:52:39 +01:00
Zhimin YE (Rex) 654030f09d Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-23 14:02:54 +01:00
Zhimin YE (Rex) f82232ae05 fix: #57 2016-08-23 10:21:32 +01:00
Brandon Roberts 5c5c9ca16c fix(toh-5): Fixed issues in tutorial flow
The HeroDetailComponent should be in the module declarations from the beginning.
InMemoryWebApiModule.forRoot(InMemoryDataService) and correct text
2016-08-19 03:43:00 -07:00
Brandon Roberts a35fcb4dfd chore(router): Added ModuleWithProviders to routing exports
closes #2113
2016-08-18 23:57:54 -07:00
Jesús Rodríguez e9a41bac47 docs(toh): add return types
closes #1983
2016-08-17 22:41:06 -07:00
Jesús Rodríguez a2d6ea3a97 docs(toh): consistency fix
closes #2087
2016-08-17 17:47:15 -07:00
Patrice Chalin 44862b95f8 docs(toh-3): fix for empty tab (#2122)
Fixes #2119.
2016-08-17 13:33:11 -07:00
Patrice Chalin 0c0c6f69f3 docs(toh-5): TS/Dart review, and Dart resync (#2115)
* docs(toh-5): review and update/resync Dart

**NOTE: run `gulp add-example-boilerplate` after pulling in the
commit.**

This is preparatory work for #2035.
As part of the the chapter review, the Dart .jade was enhanced to use
Jade extends (#2018).
By the same token it contributed to a post-RC5 resync (#2077). Other
key changes:

Dart and TS code:
- Eliminated `styles.1.css` in favor of docregions in `styles.css`.
- `docregion` tags renamed in a few places.
- **No other code changes**.

TS prose
- Fixed: misnamed variable `routing` -> `appRoutes`.
- All other changes are **minor copy edits**, or changes to support
Dart via Jade extends.

Diff of generated HTML for TS chapter was inspected to ensure only
minor copy edits prevailed (i.e., that the support for Jade extends had
no impact on the generated HTML).

* docs(toh-5): edits after doing tutorial

- Some adjustments following actually doing the tutorial. In some cases code shown (e.g. this is what file foo should look like now) didn't match what the user would have. E.g., lingering @Input on the hero property.
- Fixed some lingering deprecated-router prose elements on TS side (e.g., still referring to a route by the old string names like `HeroDetail`).
- Added extra step to `app.component.ts` creation rather than having a critical-call-out later on.
- Reorder some prose for better harmony between TS and Dart prose (also improves the flow).
- Moved the `styleUrls` call-out to the point of first use.

* post-review changes

* more post-review changes

* toh-6 cache update
2016-08-17 13:31:40 -07:00
Patrice Chalin 9869bf585d docs(toh-6): systemjs.config.json -> systemjs.config.js (#2116)
Copyedit in file tree.
2016-08-17 11:11:50 -07:00
Zhimin YE (Rex) f26ec0a889 (review:) Quick starter and TOH, patch up new paragraphs and mis-alignments. 2016-08-16 10:16:31 +01:00
Patrice Chalin dfd46af604 docs(toh-6): post-RC5 Dart resync and TS fixes (#2095)
* toh-6: trim spaces from cache file to simplify diff

* toh-6: copy latest over cache before editing latest

* docs(toh-6): post-RC5 Dart resync and TS fixes

Contributes to #2077.

TS-side changes include:
- Merged three versions of `app/app.module{,1,2}.ts` into a single file
and used docregions instead.
- Misnamed files:
  - `rxjs-operators.ts` -> `rxjs-extensions.ts`
  - `hero-search.service.html` -> `hero-search.component.html`
- Fixed BAD FILENAME error.

Lint reports no errors and toh-6 e2e tests pass.
2016-08-12 11:21:16 -07:00
Zhicheng Wang 94aa3664ab Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.gitignore
#	public/docs/_examples/cb-component-communication/ts/app/app.component.ts
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-12 07:57:51 +08:00
Peter Bacon Darwin d79adb2422 docs(rc5): update docs and plunkers for rc5 2016-08-09 11:48:07 -07:00
Zhicheng Wang 251d4ffe6c 合并了官方的最新更新 2016-08-06 20:04:41 +08:00
Zhicheng Wang d034bc33c8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/contribute.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-06 19:52:08 +08:00
Adam d26afa90fd docs(toh-6): Move styles from sample.css to heroes.component.css
closes #1751
Move additional styles from `sample.css` to `hero-search.component.css`.
Edit tutorial to reflect the removal of `sample.css` and the change to `heroes.component.css`.
Edit tutorial to reflect the addition of `hero-search.component.css` file.
Edit `hero-search.component.ts` to include styles from `hero-search.component.css`.
Remove reference to `/public/docs/_examples/toh-6/ts/sample.css` from `/public/docs/_examples/toh-6/ts/index.html`.
2016-08-05 16:45:53 -07:00
雪狼 ab4ce4f48f Merge pull request #45 from kapr1k0rn/master
修正一些教程->服务页面的翻译
2016-08-03 00:56:40 -05:00
Patrice Chalin 8a6c5b5725 docs(toh-6): add hero search to Dart; minor edits to TS (#2018)
* docs(toh-6/dart): add hero search

Fixes #1924.

* docs(toh-6/ts): minor updates

* post-review updates

* post-review updates
2016-08-02 09:59:35 -07:00
Zhicheng Wang 05f8b866c2 校对 2016-08-02 07:04:52 +08:00
Patrice Chalin 04d5337b75 docs(toh-6): search query fixes
closes #2008
Changes:
- Drop `asObservable()` since it is deprecated in RxJS 5 (see the
[migration
guide](https://github.com/ReactiveX/RxJS/blob/master/MIGRATION.md#operat
ors-renamed-or-removed)).
- Drop `+` from hero search query URL: `app/heroes/?name=${term}+`. At
best it is interpreted as a regex op that serves no purpose, at worst,
it gets interpreted as a space (cf. [HTML 4.01 section
17.13.4](https://www.w3.org/TR/REC-html40/interact/forms.html#h-17.13.4)
).
- Rename `searchSubject` to `searchTerms`
- Other minor tweaks to prose.

This work is in preparation for #1924.

Note: toh-6 tests pass.
2016-08-01 11:50:53 -07:00
Phil adb1b1d43b fix some translation in tutorial 2016-08-01 17:35:11 +08:00
Zhimin YE (Rex) 60a06e51b9 Merge remote-tracking branch 'angular.io/master'
# Conflicts:
#	README.md
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-01 09:52:29 +01:00
Jesús Rodríguez 4507589e26 docs(toh): add explanation for using the search box
closes #2002
2016-07-29 12:44:20 -07:00
Zhimin YE (Rex) c650436be1 Fix: #42 ES2105 -> ES2015 2016-07-28 09:07:52 +01:00
Zhicheng Wang ed8b3cd9e0 微调 2016-07-26 08:16:57 +08:00
Zhicheng Wang 3233fc4a76 翻译完了新增 部分 2016-07-25 12:42:36 +08:00
Zhicheng Wang 5532c54ff7 翻译完了一部分新增英文内容 2016-07-24 22:06:39 +08:00
Zhicheng Wang 28fe7d848f 把“作用范围”批量改为“作用域” 2016-07-24 17:31:51 +08:00
Zhicheng Wang 4400deeef8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	gulpfile.js
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/resources/js/controllers/resources-controller.js
2016-07-24 17:27:48 +08:00
Torgeir Helgevold f00b96fab8 docs(toh-6): remove details about throw 2016-07-19 22:48:55 -04:00
Patrice Chalin b4c92d9c9c docs(toh-6/dart): quickfix to "BAD FILENAME" errors (#1929)
Exclude the new Observables section entirely for now.
2016-07-19 15:30:42 -07:00
Ward Bell ce2e14e4ae docs(toh-pt6): bind to a component method rather than a RxJS Subject
updated text accordingly
2016-07-19 12:26:14 -07:00
Torgeir Helgevold f50dff818a docs(toh-pt6): add observables to HTTP tutorial chapter
closes #1528
2016-07-18 23:12:44 -07:00
Benoit Lateltin 5bac678c60 docs(toh-pt5): fix typo in tutorial
closes #1913
2016-07-18 11:10:19 -07:00
Zhimin YE (Rex) 82c7f49784 review: toh-pt5.jade 2016-07-15 17:30:05 +01:00
Zhimin YE (Rex) 0e14785cba Merge remote-tracking branch 'angular.io/master'
# Conflicts:
#	README.md
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/testing/jasmine-testing-101.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-07-15 15:52:34 +01:00
Zhicheng Wang 3789144368 根据网友pshadow的勘误,改正一个错误 2016-07-14 07:52:12 +08:00
Brandon Roberts 5104470558 docs(router): Removed refs to deprecated router; lowerCamelCase constants
closes #1834
2016-07-11 21:44:12 -07:00
Zhicheng Wang 210b076594 根据网上反馈去掉了路由名字,新版已经不需要了。 2016-07-11 12:46:21 +08:00
Zhicheng Wang 6264d3bcde 批量把Provider/provide改译为提供商/提供,以和ISP(互联网服务提供商)的译法看齐 2016-07-07 08:22:36 +08:00
Zhicheng Wang 0303a18020 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/structural-directives.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/testing/testing-an-angular-pipe.jade
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-07-07 08:15:51 +08:00
Patrice Chalin b0e0d94b5c docs: revert Jade to markdown
closes #1818
Previously, the markdown of some chapters was converted to Jade markup
to support the conditional exclusion of TS prose parts in Dart
chapters. This commit reverts some of that back to clean markdown,
thanks to a few custom directives.
2016-07-05 23:03:30 -07:00
Zhicheng Wang be4748bce0 修改了一系列小bug
微调“关于”页面
2016-07-05 08:35:08 +08:00
Zhimin YE (Rex) 24ab1e5fcc Chore: break a line in toh-pt1 2016-07-04 12:00:32 +01:00
Zhicheng Wang 1a806de866 移除行尾不必要的空格 2016-07-01 08:26:45 +08:00
Zhicheng Wang dfc20a6adc Merge remote-tracking branch 'cn/master' 2016-07-01 08:25:35 +08:00
Zhicheng Wang 21fe9dc1d2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/news.jade
2016-07-01 08:24:23 +08:00
Rex fa9e83358c review(toh-pt6): done. 2016-06-30 20:35:04 +01:00
Zhimin YE (Rex) 1f883722c9 review(toh-pt6): line 243 2016-06-30 17:08:34 +01:00
Zhicheng Wang fc6e68dc5c 调整首页
内容微调
2016-06-29 10:41:21 +08:00
Brandon Roberts 97fbda0d76 docs(toh-6/ts): Upgraded http tutorial to use new router 2016-06-28 13:03:04 -07:00
Brandon Roberts f3189546a6 docs(toh-5): Upgraded tutorial to new router 2016-06-28 12:52:47 -07:00
Zhicheng Wang d7a71ccf59 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-06-28 09:40:49 +08:00
Patrice Chalin 3fe0fb077c docs(toh-6/ts): minor edits and enhancements (#1686)
* docs(toh-6/ts): minor edits and enhancements

Changes to prose:

- Complete TODO item of displaying `heroes.component` errors.
- Mainly copyedits.
- Add of blocks statements so that prose can be used on Dart side.
- Show excerpt and briefly explain of changes (previously missing):
  - `app/hero-detail.component.html`
  - `app/heroes.component.ts` error handling
- Add missing file to changed/added files listing and makeTabs
  - `toh-6/ts/app/in-memory-data.service.ts,
  - `toh-6/ts/sample.css`

Code changes:

- Mainly copyedits
- Renamed `heroes.component.ts` `delete` to `deleteHero` to match
naming of other methods

* remove unnecessary change relative to toh-5
2016-06-27 11:23:27 -07:00
Zhicheng Wang 52c118ef8a 微调 2016-06-20 15:55:30 +08:00
Zhicheng Wang d1db5bfb72 翻译了教程中的HTTP一章 2016-06-17 23:13:23 +08:00
Zhicheng Wang c889525461 begin translate toh-pt6 2016-06-16 21:51:57 +08:00
Zhicheng Wang 20c59f9e4a Add some blank lines, to avoid unnecessary conflicts on merging. 2016-06-15 23:31:28 +08:00
Zhicheng Wang c1b8183c38 Add some blank lines, to avoid unnecessary conflicts on merging. 2016-06-15 23:21:05 +08:00
Zhicheng Wang 6a5f4a0fc2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-06-15 23:10:41 +08:00
Patrice Chalin 6e5d8e6491 docs(toh-5/dart): review edits and code cleanup (#1643) 2016-06-15 07:46:26 -07:00
Zhicheng Wang 7995cb4897 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-06-14 14:04:30 +08:00
Zhicheng Wang bc2e4b83c0 把所有全角括号改成了半角的 2016-06-14 09:26:54 +08:00
Zhicheng Wang c1051cc8e1 微调
为词汇表加上了双语备注
2016-06-14 07:54:46 +08:00
Patrice Chalin ca2e5c5d1d docs(toh-4/ts): copyedits
closes #1638
2016-06-13 11:40:30 -07:00
Helmi 7f256eea75 Fix typo in 'Simulating the web api' section.
closes #1655
2016-06-13 11:05:15 -07:00
Foxandxss 61ad427319 docs(toh): add missing snippets
closes #1649
2016-06-13 10:46:53 -07:00
Patrice Chalin fd46bf4970 docs(toh-5/ts): minor edits
closes #1644
2016-06-13 10:45:23 -07:00
Patrice Chalin 070cb5a193 docs(toh-3/ts): copyedits
closes #1630
2016-06-13 10:36:04 -07:00
Patrice Chalin 16848fc822 docs(toh-2/ts): copyedits
closes #1622
2016-06-13 10:34:19 -07:00
Patrice Chalin 2fc7e5ab50 docs(toh-1/ts): minor edits
closes #1615
- Fixed HTML.
- Removed unnecessary snippet since it is in the code.
- Copyedit: (Hero property) -> (hero property).
2016-06-13 10:28:04 -07:00
Zhicheng Wang f389c57ede 来自网友Z的修改意见 2016-06-13 17:22:28 +08:00
Zhicheng Wang c802c2b5dc 来自网友张旋和Z的修改意见 2016-06-13 17:20:08 +08:00
Zhicheng Wang 164244d77a 修正了api的链接(仅中文版) 2016-06-10 14:45:12 +08:00
Zhicheng Wang f2dbdb3163 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/_examples/cb-component-communication/ts/app/app.component.ts
#	public/docs/_examples/dependency-injection/ts/app/main.1.ts
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-06-08 10:02:24 +08:00
Patrice Chalin 7e52648ee7 docs(toh): update live example links (#1602) 2016-06-07 15:51:25 -07:00
Zhicheng Wang 0a967baf51 Merge remote-tracking branch 'origin/master' 2016-06-07 09:47:24 +08:00
jevonearth f7cf6fde9f docs(toh-6): Fix typo in 'Add/Delete in the HeroesComponent' section.
closes #1603
2016-06-06 17:28:07 -07:00
Zhimin(Rex) YE 633964ac2f Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/upgrade.jade
2016-06-04 17:52:51 +01:00