diff options
| author | Igor Minar | 2011-05-10 17:45:42 -0700 | 
|---|---|---|
| committer | Igor Minar | 2011-06-06 22:51:58 -0700 | 
| commit | 3751f172b3986604853700a1475a7ad81b42a9b1 (patch) | |
| tree | f6bd09073a22e36b48a6c4454aa082d422a6fd92 /docs/content/tutorial/step_06.ngdoc | |
| parent | 3776e08db08232d38b6d5e561092ef78795ec356 (diff) | |
| download | angular.js-3751f172b3986604853700a1475a7ad81b42a9b1.tar.bz2 | |
add new batch of tutorial docs and images
Diffstat (limited to 'docs/content/tutorial/step_06.ngdoc')
| -rwxr-xr-x | docs/content/tutorial/step_06.ngdoc | 56 | 
1 files changed, 43 insertions, 13 deletions
| diff --git a/docs/content/tutorial/step_06.ngdoc b/docs/content/tutorial/step_06.ngdoc index 19d0edbc..154b984e 100755 --- a/docs/content/tutorial/step_06.ngdoc +++ b/docs/content/tutorial/step_06.ngdoc @@ -1,4 +1,4 @@ -@ngdoc overview +@ngdoc overview  @name Tutorial: Step 6  @description  <table id="tutorial_nav"> @@ -13,49 +13,64 @@ Diff}</td>  </tr>  </table> +  In this step, you will add thumbnail images for the phones in the phone list, and links that, for  now, will go nowhere. In subsequent steps you will use the links to display additional information -about the phones in the catalog.   +about the phones in the catalog. + + +1. Reset your workspace to step 6. + -1. Reset your workspace to Step 6 using: +         git checkout -f step-6 -         git checkout --force step-6    or +           ./goto_step.sh 6 +  2. Refresh your browser or check the app out on {@link -http://angular.github.com/angular-phonecat/step-6/app angular's server}. You should now see links -and images of the phones in the list. +http://angular.github.com/angular-phonecat/step-6/app angular's server}. + +You should now see links and images of the phones in the list. +  The most important changes are listed below. You can see the full diff on {@link  https://github.com/angular/angular-phonecat/compare/step-5...step-6  GitHub}: + +  ## Data +  Note that the `phones.json` file contains unique ids and image urls for each of the phones. The  urls point to the `app/img/phones/` directory. +  __`app/phones/phones.json`__ (sample snippet):  <pre>   [    {     ... -   "id": "motorola-defy-with-motoblur",  -   "imageUrl": "img/phones/motorola-defy-with-motoblur.0.jpg",  -   "name": "Motorola DEFY\u2122 with MOTOBLUR\u2122",  +   "id": "motorola-defy-with-motoblur", +   "imageUrl": "img/phones/motorola-defy-with-motoblur.0.jpg", +   "name": "Motorola DEFY\u2122 with MOTOBLUR\u2122",     ... -  },  +  },   ...   ]  </pre> + +  ## Template +  __`app/index.html`:__  <pre>  ... @@ -69,11 +84,13 @@ __`app/index.html`:__  ...  </pre> +  To dynamically generate links that will in the future lead to phone detail pages, we used the  now-familiar {@link angular.markup double-curly brace markup} in the `href` attribute values. In  step 2, we added the `{{phone.name}}` binding as the element content. In this step the  '{{phone.id}}' binding is used in the element attribute. +  We also added phone images next to each record using an image tag with the {@link  angular.directive.ng:src ng:src} directive. That directive prevents the browser from treating the  angular `{{ exppression }}` markup literally, which it would have done if we had only specified an @@ -81,8 +98,11 @@ attribute binding in a regular `src` attribute (`<img src="{{phone.imageUrl}}">`  prevents the browser from making an http request to an invalid location. + +  ## Test +  __`test/e2e/scenarios.js`__:  <pre>  ... @@ -94,28 +114,37 @@ __`test/e2e/scenarios.js`__:  ...  </pre> +  We added a new end-to-end test to verify that the app is generating correct links to the phone  views that we will implement in the upcoming steps. +  You can now refresh the browser tab with the end-to-end test runner to see the tests run, or you  can see them running on {@link  http://angular.github.com/angular-phonecat/step-6/test/e2e/runner.html  angular's server}. +  # Experiments -* Replace the `ng:src` directive with a plain old `<src>` attribute, and using tools such as -Firebug, or Chrome's Web Inspector, or by inspecting the webserver access logs, confirm that the -app is indeed making an extraneous request to `/app/%7B%7Bphone.imageUrl%7D%7D` (or + +* Replace the `ng:src` directive with a plain old `<src>` attribute. Using tools such as Firebug, +or Chrome's Web Inspector, or inspecting the webserver access logs, confirm that the app is indeed +making an extraneous request to `/app/%7B%7Bphone.imageUrl%7D%7D` (or  `/app/index.html/{{phone.imageUrl}}`). + +  # Summary +  Now that you have added phone images and links, go to step 7 to learn about angular layout  templates and how angular makes it easy to create applications that have multiple views. + +  <table id="tutorial_nav">  <tr>  <td id="previous_step">{@link tutorial.step_05 Previous}</td> @@ -127,3 +156,4 @@ Diff}</td>  <td id="next_step">{@link tutorial.step_07 Next}</td>  </tr>  </table> + | 
