Commit Graph

161 Commits

Author SHA1 Message Date
Zhicheng Wang 6af595d7bd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/_includes/_hero-home.jade
#	public/_includes/_scripts-include.jade
#	public/docs/dart/latest/_data.json
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/ajs-quick-reference.jade
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	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/form-validation.jade
#	public/docs/ts/latest/cookbook/i18n.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/ts-to-js.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/appmodule.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/change-log.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/hierarchical-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/pipes.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/setup-systemjs-anatomy.jade
#	public/docs/ts/latest/guide/setup.jade
#	public/docs/ts/latest/guide/structural-directives.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/user-input.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/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
#	public/events.jade
#	public/presskit.jade
#	public/resources/js/directives/cheatsheet.js
2017-02-26 15:39:42 +08:00
Patrice Chalin e469929123 docs: remove public/docs/dart (#2956)
* tutorial when back ported

* api when backported

* guide when backported

* quickstart, cheatsheet and glossary when backported

* remove Jekyll front matter from each back ported file

* backport Dart _util-fns.jade

* remove docs/dart

* gitignore docs/dart

* only include Dart in language menu if it exists

* README: remove mention of Dart
2016-12-09 20:05:58 +00:00
Patrice Chalin 50f5a80db1 docs(lifecycle-hooks): Dart sync with TS updates (#2952)
* initial cache sync

Also updating glossary since that was missed earlier.

* minor updates to Dart and TS jade

* final cache sync

* feedback from Ward
2016-12-08 16:48:02 -08:00
Patrice Chalin 0f64eb8535 docs: fix misc broken links for Dart (#2953) 2016-12-08 13:39:19 -08:00
Patrice Chalin 9aececb65c docs: fix broken links (#2950) 2016-12-07 14:43:43 -08:00
Patrice Chalin bc416b8e0f chore: Dart image compressed (#2933) 2016-12-06 10:01:05 -08:00
Patrice Chalin dd1811fea5 docs(dart): hide style-guide and browser-support (#2921)
* docs(dart): hide style-guide

* docs(dart): hide browser-support
2016-12-02 16:55:58 +01:00
Kathy Walrath cd235ac340 docs(dart/setup): make Dart setup more Darty 2016-12-01 12:48:06 -08:00
Patrice Chalin 4a0c3d79b7 docs(api/cheatsheet): show ng version + lang in page header (#2918) 2016-12-01 19:47:58 +00:00
rexebin edda524d0d Merge remote-tracking branch 'angular.io/master'
# Conflicts:
#	.travis.yml
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_next-item.jade
#	public/_includes/_util-fns.jade
#	public/_includes/_version-dropdown.jade
#	public/docs/_examples/package.json
#	public/docs/_examples/quickstart/dart/lib/app_component.dart
#	public/docs/_examples/quickstart/e2e-spec.ts
#	public/docs/_examples/quickstart/js/app/app.component.js
#	public/docs/_examples/quickstart/ts/app/app.component.ts
#	public/docs/_examples/quickstart/ts/index.html
#	public/docs/_examples/toh-5/dart/lib/dashboard_component.html
#	public/docs/_examples/toh-5/dart/lib/hero_detail_component.dart
#	public/docs/dart/latest/_util-fns.jade
#	public/docs/dart/latest/guide/_data.json
#	public/docs/dart/latest/guide/index.jade
#	public/docs/dart/latest/quickstart.jade
#	public/docs/index.jade
#	public/docs/js/latest/quickstart.jade
#	public/docs/ts/_cache/glossary.jade
#	public/docs/ts/_cache/guide/dependency-injection.jade
#	public/docs/ts/_cache/guide/index.jade
#	public/docs/ts/_cache/quickstart.jade
#	public/docs/ts/_cache/tutorial/toh-pt5.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/_quickstart_repo.jade
#	public/docs/ts/latest/cli-quickstart.jade
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/dynamic-form.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/browser-support.jade
#	public/docs/ts/latest/guide/change-log.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/forms.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/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/guide/testing.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/index.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
#	public/events.jade
#	public/resources/images/devguide/quickstart/hello-angular.png
#	scripts/cache.sh
#	tools/plunker-builder/indexHtmlTranslator.js
2016-11-26 21:43:16 +00:00
Patrice Chalin 0902940eeb docs(dependency-injection): updates to match TS; also minor TS fixes (#2875)
* cache file sync before making updates to Dart jade

* app.module.ts: fix ngmodule docregion

* [TS] dependency-injection.jade updates

* [Dart] dependency-injection.jade updates

* final ts/_cache file sync
2016-11-26 12:20:54 +00:00
Zhicheng Wang 74a2657e04 把小抄的历史版本加入版本控制中,以便识别改动
把小抄同步到最新版本
2016-11-25 23:00:01 +08:00
Patrice Chalin 692d751375 docs: quickstart reboot for Dart (#2867)
* cache/quickstart sync before making Dart edits

* quickstart updates for Dart

* cache/guide/index sync before making Dart edits

* guide/index updates for Dart

* learning-angular for Dart

* guide/setup for Dart

* refresh cache/tutorial/index
2016-11-23 17:58:21 +00:00
Yang Lin 5a7745fb27 Upgrade to 2.2.0 2016-11-22 20:07:16 +08:00
Patrice Chalin 2d3836c8c1 docs(cache): misc adjustments for Dart (#2830)
* docs(cache): misc adjustments for Dart

Dart cache adjustments:
- Add guide/index (it was being inherited directly from latest before).
- Add proper cache of `_quickstart_repo.jade` (it used to be just an
include).

Also:
- In `_quickstart_repo.jade` use variable set to URL of repo.
- Fix newly added link to Quickstart in guide/index.jade.

* dart/displaying-data: just use TS's _quickstart_repo
2016-11-18 22:55:21 +00:00
Patrice Chalin 1c2d14a8b8 docs(guide & api): feedback/issue links for Dart should refer to Dart repos (#2821)
* docs(guide/index): feedback link to Dart repo for Dart

- Also added links to chapters mentioned in table.
- Other minor copyedits.

* docs(api): issue links should refer to Dart repo

* post-review updates

* add link to Advance and Guide chapters

* ensure that we can determine which language is active
2016-11-17 16:53:28 -08:00
Patrice Chalin f993315931 chore(dart): complete the renaming of "Angular 2" to "Angular" (#2820)
Contributes to #2407

- Dropped the “2” in “Angular 2” and “angular2_*” where appropriate.
- Did a partial sync of `_cache/guide/pipes.jade`
- In quickstart, changed `Try changing the message to "Hello Angular
2!”` to `Try changing the message to "Hello Again Angular!”`.
2016-11-17 14:10:28 -08:00
Patrice Chalin 0dfda08306 docs: in links use href=foo#bar not foo#!#bar (#2807) 2016-11-15 15:36:34 -08:00
Patrice Chalin 9e9666b2cc docs(template-syntax/dart): updates to match TS (#2751)
* docs(template-syntax): refresh _cache

* docs(template-syntax/dart): updates to match TS

- Propagates TS-side changes:
  - update #2639 - new two-way binding section, and
  - fix #2687 - invalid attr syntax
- Fixes
  - #1898 - currency symbols
  - #2748 - Dart template-syntax e2e is failing
  - #2749 - deprecated `[className]`

* updated _cache file following Kathy's post-review edits

* Post Ward's review w/ cache updated

- Keep `my-` and `my` prefixes on selectors (for components and
directives, respectively).
- Drop `my-` from file names.
- Drop `My` as component class prefix.
2016-11-14 08:34:10 -08:00
Patrice Chalin 5dcffd69dc docs: dart glossary - fix misnamed Jade block 2016-11-14 08:31:59 -08:00
Patrice Chalin 6b37da78e4 docs(forms/dart): remove mention of FORM_DIRECTIVES
Fixes #2752
2016-11-08 15:55:52 -08:00
Patrice Chalin 5e79a1a2b5 chore: fix broken links and transform API links for dart docs
- Dart non-api doc pages w/ links to API entries will now have those
links translated from a TS API reference URL to a Dart API reference
URL.
- Created and ran a link checker to verify that all such links to API
entries refer to Dart.
- Fixed links to pages that have moved:
 - JS & Dart: `i18n` is under now `cookbook` not `guide`
 - Dart: testing page is now directly under guide.

Contributes to #1895
Fixes #2273
2016-11-07 13:24:20 -08:00
Zhimin YE b7d99121e7 fix: _data.json 2016-10-18 11:03:18 +01:00
Kathy Walrath 6e7780dee0 docs(dart/router): link to router tutorial instead of TS router docs (#2529) 2016-10-03 10:52:03 -07:00
Ward Bell 56ac24b411 chore: fix broken links on 9/30, mostly API links (#2520) 2016-10-01 07:11:21 -07:00
Ward Bell e6199a8dfb docs(i18n): add internationalization (i18n) guide (#2491)
* docs(i18n): add internationalization (i18n) guide

* docs(cb-i18n): revamped to System.import the translation file
2016-09-29 11:15:55 -07:00
Ward Bell 6def9505cc chore: convert templateUrls to use moduleId where possible. (#2477) 2016-09-25 18:51:54 -07:00
Ward Bell b478aaf7a2 docs(testing): from Igor Minar feedback (Part 1) (#2450) 2016-09-23 02:03:20 -07:00
Patrice Chalin 36a3ea2c21 docs(user-input): misc fixes (#2430)
- Remove nonexistent `<important>` “element” since it causes problems
for ng2.io. This is probably a typo. It was more likely meant to be an
anchor name than an element name.
- Fix two PENDING links.
2016-09-21 08:48: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 0c678c2355 docs: use Jade include rather than Harp partial (#2392)
No net effect on the generated docs.
Preparatory work for ng2.io.
2016-09-19 20:08:03 -07:00
Ward Bell 1fb488b4ec docs: delete forms- and router-deprecated, jade + examples (#2328) 2016-09-13 18:49:51 -07:00
Ward Bell 01b211193c docs(browser-support): edits (#2299) 2016-09-09 22:21:40 -04:00
Marc Laval d4a641e553 docs(browser-support): document browser support and polyfills (#2244) 2016-09-09 10:02:02 -07:00
Patrice Chalin 562e99463a chore(cheatsheet): fix double banner issue (#2293)
Each page is designed to have a single banner; adjust the cheatsheet to
follow this convention. Also eliminate the article nested within the
`l-conent` div.

Propagated changes/cleanup to JS and Dart.
2016-09-08 15:01:39 -07:00
Drew Hintz 5b09914550 chore: better compression of images using zopfli
closes #2196
2016-08-26 10:19:12 -07:00
Patrice Chalin 014883d074 docs(*): fix links to Dart API entries (#2185)
* docs(*): fix links to Dart API entries

* post-review updates
2016-08-24 14:46:06 -07: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 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 68c15c12e5 docs({quickstart,di}): fix code excerpts and titles (#2118) 2016-08-17 09:21:11 -07:00
Ward Bell aef8aa94aa docs(ngmodule): add chapter 2016-08-09 12:31:52 -07:00
Patrice Chalin 5ce8304227 docs(dart): decouple from TS .jade files temporarily (#2044)
Addresses #2043.
2016-08-08 15:48:45 -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
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
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