Commit Graph

278 Commits

Author SHA1 Message Date
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
Patrice Chalin fcaf8fa365 docs(forms): add link to Dart sample (#2176)
Contributes to #1598.

Also:
- Trimmed trailing whitespace.
- Fixing user-input (since we don’t need the “Run the” in the link).
2016-08-22 15:41:13 -07:00
Patrice Chalin 9b3614d151 docs(user-input): add link to Dart sample (#2175)
Contributes to #1598.
2016-08-22 15:15:30 -07:00
Patrice Chalin f0daf5d238 docs(lifecycle-hooks): post-RC5 Dart resync (#2141)
* lifecycle-hooks: copy latest to cache

* docs(lifecycle-hooks): post-RC5 Dart resync

- TS prose: removed mention of `routerOnActivate` which no longer
exists in the new router.
- TS improvements to the sample code have also been propagated to the
Dart sample.

Contributes to #2077.
E2E tests pass now.

* post-review updates
2016-08-19 15:07:30 -07:00
Patrice Chalin 0a631087fa docs(dart): upgrade to beta.20 (#2142) 2016-08-18 22:47:52 -07:00
Patrice Chalin 08dec19447 docs(glossary): general cleanup and fix links (#2100)
* glossary: replace cached by latest before edits

* docs(glossary): general cleanup and fix links

This commit addresses issues with the glossary for all languages (JS, TS, Dart).

Fixes #1123, #1838, #2036.

This was originally started as post-RC5 Dart resync, but since mixing Harp partials with Jade mixins can be problematic, this commit does a general cleanup of the 3 x 2 = 6 glossary files (found in `{ts,js,dart}/latest/{.,guide}`).

This commit builds upon #2098 (which created the first `ts/_cache` copy of the glossary), but doesn't really depend on it.

* post-review updates

* post-review updates
2016-08-17 17:50:42 -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 68c15c12e5 docs({quickstart,di}): fix code excerpts and titles (#2118) 2016-08-17 09:21:11 -07: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
Patrice Chalin 2ca6d6567b chore(quickstart/dart): refresh ts _cache (#2089)
Cf. #2088 and #2077.
2016-08-11 11:29:19 -07:00
Patrice Chalin 19d06061c5 docs(quickstart): post-RC5 Dart resync (#2078)
* docs(quickstart): post-RC5 Dart resync

- Resync Dart QS prose with TS, post RC5.
- Added to-be-shared Jade `var` definitions to `_util-fns.jade`.
- Delete cached QS jade file.
- Eliminate the stub file `styles.1.css` in favor of a `docregion` in
the main `styles.css`.

This commit requires a `gulp add-example-boilerplate` after pulling it in.
Contributes to #2077.

* post-review edits
2016-08-10 13:32:07 -07:00
Benjamin Dopplinger c8cc3226cc docs(toh-pt5/dart): remove an already existing line (#2056)
Remove an import statement as the package is already imported at this stage of the tutorial.
2016-08-09 17:17:56 -07:00
Ward Bell aef8aa94aa docs(ngmodule): add chapter 2016-08-09 12:31:52 -07:00
Ward Bell fe35bc6c31 docs(rc4-to-rc5): New RC4->RC5 migration cookbook. 2016-08-09 12:28:25 -07:00
Benjamin Dopplinger ef1171bd36 docs(toh-pt5/dart): fix grammar mistakes (#2057) 2016-08-09 10:43:42 -07:00
Patrice Chalin 5ce8304227 docs(dart): decouple from TS .jade files temporarily (#2044)
Addresses #2043.
2016-08-08 15:48:45 -07: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
Peter Bacon Darwin 35b2dbd867 docs(tutorial): text following a node requires a dot 2016-08-06 07:58:28 +01:00
Brandon Roberts 14ad2a8c68 fix(docs): Renamed files for JavaScript/Dart dynamic form cookbook
closes #2010
2016-08-05 16:57:48 -07:00
Patrice Chalin 531d6a8bce docs(glossary/dart): recover content (#2037)
Fixes #1918.

Follow-up work will be done under #2036.
2016-08-05 12:13:29 -07:00
Patrice Chalin 6a2cad2640 docs(chore): ensure {forms|router}{,-deprecated} chapters have proper content (#2034)
Fixes #2026.
2016-08-05 11:13:32 -07:00
Kathy Walrath a423724847 docs(dart): update angular.io/dart's link to change log 2016-08-03 12:29:04 -07: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 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
Patrice Chalin eafd7db119 chore(ng2/dart): update from beta.1x to beta.18 (#1941)
* chore(ng2/dart): update from beta.1x to beta.18

Update made to all `pubspec.yaml` files and to relevant prose.
Note that pipes was back a beta.15; the rest were at beta.17.

* chore(pipes/dart): update ngFor microsyntax and transform method param

Updates to pipe example source code:
- Pipe `transform()` method parameters
- `ngFor` microsyntax, from `#` to `let`
2016-07-20 15:51:23 -07: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
Patrice Chalin 753452650c docs(cheatsheet/dart): generate from dart sources (#1912)
* docs(cheatsheet/dart): generate from dart sources

Fixes #1906.
2016-07-19 12:35:39 -07:00
Zhicheng Wang e140256358 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
2016-07-17 20:40:12 +08:00
Patrice Chalin 1bef20abc4 docs(api/dart): add support for generation and display (#1888)
Fixes #1880.
Supersedes #1593.
2016-07-15 14:10:12 -07: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
Patrice Chalin 98e5d4af77 docs(all): link cleanup - broken and outdated
closes #1841
Fixes all broken links except genuine errors (see #1840), have been
resolved as of 2016-07-06
(https://github.com/angular/angular/commit/2708ce6a17667a2369c83bcf244c9
366b058d4c9).

Fixes #1574
2016-07-11 21:50:07 -07:00
Patrice Chalin 761f857f13 docs(architecture/dart): proofread, updated Dart/TS app and jade
closes #1807
- e2e tests now also cover the tax calculator.
- Dart app updated to match TS (it had no sales tax calculator).
- TS sample source cleanup (e.g. removed many unnecessary `docregions`).
- Prose updated to include @kwalrath's revisions from a while ago, Ward's comments, and
some of my edits as well.

Contributes to #1598 and #1508.
2016-07-11 20:35:06 -07:00
Patrice Chalin fb9edf972e chore: fix "Invalid example" warnings from shred map builder
closes #1832
The shred map (xref) builder was issuing warnings. This fix includes
- Adjustments to the shredder map builder itself so that it
understands, e.g., app-project relative example paths.
- `**/guide/glossary.jade` now (Jade) `includes` the shared parent
`glossary.jade` rather than (Harp) importing (via `partial`). This
fixes `makeExample` path issues in the glossary.
- Adjusted some `makeExample` paths that were ok for site build, but
confused the xref tool.
2016-07-11 20:10:56 -07:00
Zhicheng Wang 273a0fd1e8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/webpack.jade
2016-07-11 08:32:56 +08:00
Patrice Chalin 801ac76da0 docs(guide/displaying-data): proofread (#1819)
* docs(displaying-data/dart): proofread

- Dart prose simplified by removing discussion of "additions to
pubspec.yaml" which are no longer necessary given the current state of
QuickStart.
- E2e suites passed:
  public/docs/_examples/displaying-data/dart
  public/docs/_examples/displaying-data/ts

Contributes to #1598 and #1508.

* docs(displaying-data/ts): proofread

- TS prose updated to include @kwalrath's revisions from a while ago,
with some of my edits as well.
- E2e suites passed:
  public/docs/_examples/displaying-data/dart
  public/docs/_examples/displaying-data/ts

* docs(displaying-data/ts): post-review edits
2016-07-07 14:00:19 -07:00
Patrice Chalin ff718f4211 docs(cheatsheet/dart): alert reader of possible inaccuracies (#1814)
Until we can generate the cheat sheet properly, at least alert reader
of possible inaccuracies.
2016-07-07 11:42:04 -07: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 3c5a045633 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/router.jade
2016-07-02 19:16:00 +08:00
Patrice Chalin 0ba3d5d8d6 docs(dart/{quickstart,toh-[56]}): fix project names (#1773)
- Renamed `angular2_getting_started` to `angular2_quickstart` (to match
TS).
- s/-/_/g in project names elsewhere (only toh-5 & -6 needed to be
updated).

Fixes #378.
2016-07-01 11:05:45 -07: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
Naomi Black 8548d3cb06 chore(nav): update left nav to add glossary back 2016-06-28 13:58:30 -07:00
Patrice Chalin f06398cd89 docs(toh-6/dart): first edition of prose and example code (#1687)
* docs(toh-6/dart): first edition of prose and example code

NOTE: this PR depends on #1686.

Dart prose and example match TS except that:
- No child-to-parent event emission occurs.
- Support for Add Hero is added as an unconditional feature of the
Heroes view.
- http `_post` takes only a name
- http `delete` takes only a hero id.
- The Dart in-memory-data-service has been dropped in favor of an
implementation based on the "standard" `http.testing.MockClient` class.

* post-review changes
2016-06-28 13:12:49 -07:00
Zhicheng Wang bb9adc3eba Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/style-guide.jade
2016-06-23 08:48:57 +08:00
Naomi Black 7d5614ef82 chore(version): bump the docs version to rc3 2016-06-22 15:07:34 -07:00
Martin Probst fb179d9690 docs(security): Add security documentation.
Substantially rewritten, based on original content by Brian Clarkio and
Ward Bell and contributions from Naomi Black.
2016-06-21 10:51:25 -07:00
Zhicheng Wang 0aa207bbac Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/_data.json
2016-06-19 10:17:03 +08:00
Kathy Walrath 511ee3d8ed [WIP] Add link to AngularDart API docs 2016-06-16 13:37:44 -07:00
Zhimin YE (Rex) e8a462435c Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cheatsheet.jade
#	public/news.jade
2016-06-16 09:03:59 +01:00