honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,497 Commits 5 Branches 1 Tag
Commit Graph

210 Commits

Author SHA1 Message Date
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