diff options
| author | Igor Minar | 2011-06-06 22:02:30 -0700 | 
|---|---|---|
| committer | Igor Minar | 2011-06-06 23:10:30 -0700 | 
| commit | c35b0a7907de1535269876668c345ce944681804 (patch) | |
| tree | a3ba548369ca65db790809197196ae946cc93a18 /docs/content/tutorial | |
| parent | 805bb5bb6e5842a5760976a446074d553609f5b6 (diff) | |
| download | angular.js-c35b0a7907de1535269876668c345ce944681804.tar.bz2 | |
yet another docs batch
Diffstat (limited to 'docs/content/tutorial')
| -rw-r--r-- | docs/content/tutorial/index.ngdoc | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | docs/content/tutorial/step_00.ngdoc | 10 | ||||
| -rw-r--r--[-rwxr-xr-x] | docs/content/tutorial/step_01.ngdoc | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | docs/content/tutorial/step_02.ngdoc | 30 | ||||
| -rw-r--r--[-rwxr-xr-x] | docs/content/tutorial/step_03.ngdoc | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | docs/content/tutorial/step_04.ngdoc | 7 | ||||
| -rw-r--r--[-rwxr-xr-x] | docs/content/tutorial/step_05.ngdoc | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | docs/content/tutorial/step_06.ngdoc | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | docs/content/tutorial/step_07.ngdoc | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | docs/content/tutorial/step_08.ngdoc | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | docs/content/tutorial/step_09.ngdoc | 0 | 
11 files changed, 29 insertions, 30 deletions
| diff --git a/docs/content/tutorial/index.ngdoc b/docs/content/tutorial/index.ngdoc index eb4c7e11..68793134 100644 --- a/docs/content/tutorial/index.ngdoc +++ b/docs/content/tutorial/index.ngdoc @@ -18,9 +18,9 @@ use of extensions or plugins.  * You will see examples of how to use client-side data binding and dependency injection to build  dynamic views of data that change immediately in response to user actions. -* You will see how Angular creates listeners on your data without the need for DOM manipulation. +* You will see how angular creates listeners on your data without the need for DOM manipulation.  * You will learn a better, easier way to test your web apps. -* You will learn how to use Angular services to make common web tasks, such as getting data into +* You will learn how to use angular services to make common web tasks, such as getting data into  your app, easier. diff --git a/docs/content/tutorial/step_00.ngdoc b/docs/content/tutorial/step_00.ngdoc index e97f4038..09b06109 100755..100644 --- a/docs/content/tutorial/step_00.ngdoc +++ b/docs/content/tutorial/step_00.ngdoc @@ -8,7 +8,7 @@ -You are now ready to build the phone cat application. In this step, you will become familiar with +You are now ready to build the phonecat application. In this step, you will become familiar with  the most important source code files, learn how to start the development servers bundled with  angular-seed, and run the application in the browser. @@ -20,7 +20,7 @@ angular-seed, and run the application in the browser.      <ol>        <li><p>In angular-phonecat directory, run this command:</p>        <pre><code>git checkout -f step-0</code></pre> -      <p>This resets your workspace to Step 0 of the tutorial app.</p> +      <p>This resets your workspace to step 0 of the tutorial app.</p>        <p>You must repeat this for every future step in the tutorial and change the number to        the number of the step you are on. This will cause any changes you made within        your working directory to be lost.</p></li> @@ -56,7 +56,7 @@ directory.</li>      <ol>        <li><p>Open msysGit bash and run this command (in angular-phonecat directory):</p>        <pre><code>git checkout -f step-0</code></pre> -      <p>This resets your workspace to Step 0 of the tutorial app.</p> +      <p>This resets your workspace to step 0 of the tutorial app.</p>        <p>You must repeat this for every future step in the tutorial and change the number to        the number of the step you are on. This will cause any changes you made within        your working directory to be lost.</p></li> @@ -90,7 +90,7 @@ directory.</li>      <ol>        <li><p>In angular-phonecat directory, run this command:</p>        <pre><code>./goto_step.sh 0</code></pre> -      <p>This resets your workspace to Step 0 of the tutorial app.</p> +      <p>This resets your workspace to step 0 of the tutorial app.</p>        <p>You must repeat this for every future step in the tutorial and change the number to        the number of the step you are on. This will cause any changes you made within        your working directory to be lost.</p></li> @@ -124,7 +124,7 @@ href="http://localhost:8000/app/index.html">http://localhost:8000/app/index.html      <ol>        <li><p>Open windows command line and run this command (in angular-phonecat directory):</p>        <pre><code>goto_step.bat 0</code></pre> -      <p>This resets your workspace to Step 0 of the tutorial app.</p> +      <p>This resets your workspace to step 0 of the tutorial app.</p>        <p>You must repeat this for every future step in the tutorial and change the number to        the number of the step you are on. This will cause any changes you made within        your working directory to be lost.</p></li> diff --git a/docs/content/tutorial/step_01.ngdoc b/docs/content/tutorial/step_01.ngdoc index 81d9082a..81d9082a 100755..100644 --- a/docs/content/tutorial/step_01.ngdoc +++ b/docs/content/tutorial/step_01.ngdoc diff --git a/docs/content/tutorial/step_02.ngdoc b/docs/content/tutorial/step_02.ngdoc index 10721679..1715990b 100755..100644 --- a/docs/content/tutorial/step_02.ngdoc +++ b/docs/content/tutorial/step_02.ngdoc @@ -66,15 +66,15 @@ widget} and two {@link guide/dev_guide.expressions angular expressions} enclosed  `{{phone.name}}` and `{{phone.snippet}}`: -    * The `ng:repeat="phone in phones"` statement in the `<li>` tag is an angular repeater.  It -tells angular to create a `<li>` element for each phone in the phones list, using the first `<li>` -tag as the template. +* The `ng:repeat="phone in phones"` statement in the `<li>` tag is an angular repeater.  It tells +angular to create a `<li>` element for each phone in the phones list, using the first `<li>` tag as +the template.        <img src="img/tutorial/tutorial_02_final.png"> -    * The curly braces around `phone.name` and `phone.snippet` are an example of {@link +* The curly braces around `phone.name` and `phone.snippet` are an example of {@link  guide/dev_guide.compiler.markup angular markup}. The curly markup is shorthand for the angular  directive {@link api/angular.directive.ng:bind ng:bind}. The `ng:bind` directives indicate to  angular that these are template binding points. Binding points are locations in the template where @@ -117,20 +117,18 @@ the model and the view. Note in the following how we connected the dots between  data, and logic components: -    * The name of our controller function (in the JavaScript file `controllers.js`) matches the -{@link api/angular.directive.@ng:controller ng:controller} directive in the `<body>` tag -(`PhoneListCtrl`). -    * We instantiated our data within the scope of our controller function, and our template -binding points are located within the block bounded by the `<body ng:controller="PhoneListCtrl">` -tag. +* The name of our controller function (in the JavaScript file `controllers.js`) matches the {@link +api/angular.directive.ng:controller ng:controller} directive in the `<body>` tag (`PhoneListCtrl`). +* We instantiated our data within the scope of our controller function, and our template binding +points are located within the block bounded by the `<body ng:controller="PhoneListCtrl">` tag. -    Angular scopes are a crucial concept in angular; you can think of scopes as the glue that makes -the template, model and controller all work together. Angular uses scopes, along with the -information contained in the template, data model, and controller, to keep the model and view -separated but in sync. Any changes to the model are reflected in the view; any changes that occur -in the view are reflected in the model. To learn more about angular scopes, see the {@link -api/angular.scope angular scope documentation}. +Angular scopes are a crucial concept in angular; you can think of scopes as the glue that makes the +template, model and controller all work together. Angular uses scopes, along with the information +contained in the template, data model, and controller, to keep the model and view separated but in +sync. Any changes to the model are reflected in the view; any changes that occur in the view are +reflected in the model. To learn more about angular scopes, see the {@link api/angular.scope +angular scope documentation}. diff --git a/docs/content/tutorial/step_03.ngdoc b/docs/content/tutorial/step_03.ngdoc index 8425ab9a..c4654998 100755..100644 --- a/docs/content/tutorial/step_03.ngdoc +++ b/docs/content/tutorial/step_03.ngdoc @@ -59,7 +59,7 @@ __`app/index.html`:__  </pre> -We added a standard HTML `<input>` tag and use angular's {@link api/angular.array.filter $filter} +We added a standard HTML `<input>` tag and use angular's {@link api/angular.Array.filter $filter}  function to process the input for the `ng:repeater`. @@ -80,7 +80,7 @@ the DOM to reflect the current state of the model.        <img src="img/tutorial/tutorial_03_final.png"> -* Use of `$filter`. The {@link api/angular.array.filter $filter} method, uses the `query` value, to +* Use of `$filter`. The {@link api/angular.Array.filter $filter} method, uses the `query` value, to  create a new array that contains only those records that match the `query`. @@ -207,7 +207,7 @@ element with `id` `"status"` and content with the `query` binding into the `inde  make the test pass. -* Add a `wait();` statement into an end-to-end test and rerun it.  You'll see the runner pausing, +* Add a `pause()` statement into an end-to-end test and rerun it.  You'll see the runner pausing,  giving you the opportunity to explore the state of your application displayed in the browser. The  app is live! Change the search query to prove it. This is great for troubleshooting end-to-end  tests. diff --git a/docs/content/tutorial/step_04.ngdoc b/docs/content/tutorial/step_04.ngdoc index 7d5419e3..7c942c34 100755..100644 --- a/docs/content/tutorial/step_04.ngdoc +++ b/docs/content/tutorial/step_04.ngdoc @@ -71,9 +71,9 @@ two provided sorting options.        <img src="img/tutorial/tutorial_04-06_final.png"> -* We then chained the `$filter` method with {@link api/angular.array.orderBy `$orderBy`} method to +* We then chained the `$filter` method with {@link api/angular.Array.orderBy `$orderBy`} method to  further process the input into the repeater. `$orderBy` is a utility method similar to {@link -api/angular.array.filter `$filter`}, but instead of filtering an array, it reorders it. +api/angular.Array.filter `$filter`}, but instead of filtering an array, it reorders it.  Angular creates a two way data-binding between the select element and the `orderProp` model. @@ -201,7 +201,8 @@ Let's turn our attention to the end-to-end test.  __`test/e2e/scenarios.js`:__  <pre>  ... -    it('should be possible to control phone order via the drop down select box', function() { +    it('should be possible to control phone order via the drop down select box', +        function() {        // let's narrow the dataset to make the test assertions shorter diff --git a/docs/content/tutorial/step_05.ngdoc b/docs/content/tutorial/step_05.ngdoc index 4bd4e4b3..68cc726a 100755..100644 --- a/docs/content/tutorial/step_05.ngdoc +++ b/docs/content/tutorial/step_05.ngdoc @@ -103,7 +103,7 @@ To use a service in angular, you simply declare the names of the services you ne  the controller's constructor function, as follows: -    function PhoneListCtrl($xhr) { +    function PhoneListCtrl($xhr) {...}  Angular's dependency injector provides services to your controller when the controller is being diff --git a/docs/content/tutorial/step_06.ngdoc b/docs/content/tutorial/step_06.ngdoc index e7fa1660..e7fa1660 100755..100644 --- a/docs/content/tutorial/step_06.ngdoc +++ b/docs/content/tutorial/step_06.ngdoc diff --git a/docs/content/tutorial/step_07.ngdoc b/docs/content/tutorial/step_07.ngdoc index cda63463..cda63463 100755..100644 --- a/docs/content/tutorial/step_07.ngdoc +++ b/docs/content/tutorial/step_07.ngdoc diff --git a/docs/content/tutorial/step_08.ngdoc b/docs/content/tutorial/step_08.ngdoc index c0ba2831..c0ba2831 100755..100644 --- a/docs/content/tutorial/step_08.ngdoc +++ b/docs/content/tutorial/step_08.ngdoc diff --git a/docs/content/tutorial/step_09.ngdoc b/docs/content/tutorial/step_09.ngdoc index fc9ba360..fc9ba360 100755..100644 --- a/docs/content/tutorial/step_09.ngdoc +++ b/docs/content/tutorial/step_09.ngdoc | 
