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

chore(_util-fns): generalize makeExample, drop makeProjExample #1510

Merged
merged 3 commits into from
Jun 2, 2016

Conversation

chalin
Copy link
Contributor

@chalin chalin commented May 25, 2016

makeExample can now work with both doc folder relative and project relative paths.

@chalin
Copy link
Contributor Author

chalin commented May 25, 2016

@wardbell, @Foxandxss et al.: keeping things simple and dropping the recently introduced makeProjExample in favor of using only makeExample or makeExcerpt.

FYI, I performed a diff of the generated site (www folder) before and after this PR and nothing changes -- actually, it fixes one bug in an example title on the Dart side, see below:

cc: @kwalrath


diff -r of www before vs. after this PR:

diff -r -x cheatsheet.json www/docs/dart/latest/quickstart.html 20160524/www/docs/dart/latest/quickstart.html
263c263
< <div class="example-title">web/web/styles.css (excerpt)</div><code-example language="css" format="">h1 {
---
> <div class="example-title">web/styles.css (excerpt)</div><code-example language="css" format="">h1 {

@chalin chalin force-pushed the chalin-chore-make-example-0524 branch 6 times, most recently from 1a29503 to c06ca55 Compare May 31, 2016 15:40
@@ -28,7 +28,7 @@ mixin liveExampleLink2(linkText, exampleUrlPartName)
- var href = 'http://github.com/angular-examples/' + ex;
span #[+liveExampleLink(linkText, ex)] (#[a(href='#{href}' target="_blank") #{srcText}])

- var adjustExamplePath = function(_path) {
- var adjustTsExamplePath4Dart = function(_path) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: s/4/to

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changed s/4/For/.

@thso
Copy link
Contributor

thso commented May 31, 2016

Minor comments, but looks good to me!

@chalin
Copy link
Contributor Author

chalin commented May 31, 2016

@thso : done - either fixed issue or responded with feedback.

@chalin chalin force-pushed the chalin-chore-make-example-0524 branch 3 times, most recently from 1ac7776 to a0b5efa Compare June 1, 2016 23:42
chalin added 3 commits June 1, 2016 16:43
Preparation for further refactorings.
`makeExample` can now work with both doc folder relative and project
relative paths.
@chalin chalin force-pushed the chalin-chore-make-example-0524 branch from a0b5efa to 8b16ded Compare June 1, 2016 23:43
@thso thso merged commit b48cde3 into angular:master Jun 2, 2016
@chalin chalin deleted the chalin-chore-make-example-0524 branch June 2, 2016 17:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants