Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

docs(guide/displaying-data): proofread#1819

Merged
kwalrath merged 3 commits intoangular:masterfrom
chalin:chalin-guide-disp-data-0702
Jul 7, 2016
Merged

docs(guide/displaying-data): proofread#1819
kwalrath merged 3 commits intoangular:masterfrom
chalin:chalin-guide-disp-data-0702

Conversation

@chalin
Copy link
Copy Markdown
Contributor

@chalin chalin commented Jul 4, 2016

  • TS prose updated to include @kwalrath's revisions from a while ago, with some of my edits as well.
  • 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.
Depends on #1818.

@chalin
Copy link
Copy Markdown
Contributor Author

chalin commented Jul 4, 2016

@Foxandxss @wardbell @kwalrath : ready for review. As usual, it is best viewed by ignoring whitespace diffs.

@Foxandxss
Copy link
Copy Markdown
Member

TS part works for me.

@chalin chalin force-pushed the chalin-guide-disp-data-0702 branch from d653f20 to 13e7e07 Compare July 4, 2016 21:16
* declares a constructor parameter and its type
* declares a public property of the same name
* initializes that property with the corresponding argument when we "new" an instance of the class
+makeExcerpt('app/hero.ts ()', 'id')
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does the () in here?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because of the () the mixin will render the title as app/hero.ts (excerpt).

* [Showing !{_an} !{_array} property with NgFor](#ngFor)
* [Conditional display with NgIf](#ngIf)

<li if-docs="ts">only ts</li>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this line here? This shows up as a weird "only ts" bullet item in the TS version of the docs...

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was just for a test. It should not have been left in (no sure how it slipped by). Thanks for catching it!

Fixed.

@kwalrath
Copy link
Copy Markdown
Contributor

kwalrath commented Jul 7, 2016

I did a side-by-side comparison, and apart from the couple of minor things I commented on, LGTM.

@chalin chalin force-pushed the chalin-guide-disp-data-0702 branch from db70c41 to 13fe33f Compare July 7, 2016 19:26
@chalin
Copy link
Copy Markdown
Contributor Author

chalin commented Jul 7, 2016

Fixed and committed.

chalin added 3 commits July 7, 2016 12:30
- 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 angular#1598 and angular#1508.
- 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
@chalin chalin force-pushed the chalin-guide-disp-data-0702 branch from 13fe33f to 1fb1df4 Compare July 7, 2016 19:30
@kwalrath
Copy link
Copy Markdown
Contributor

kwalrath commented Jul 7, 2016

LGTM

@kwalrath kwalrath merged commit 801ac76 into angular:master Jul 7, 2016
@chalin chalin deleted the chalin-guide-disp-data-0702 branch July 7, 2016 21:10
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants