From b842642b574a2b95c53b791308ed1bf8ff9d304d Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Wed, 15 Jun 2011 22:31:40 -0700 Subject: docs - stripping extra new lines --- docs/content/tutorial/step_02.ngdoc | 64 ------------------------------------- 1 file changed, 64 deletions(-) (limited to 'docs/content/tutorial/step_02.ngdoc') diff --git a/docs/content/tutorial/step_02.ngdoc b/docs/content/tutorial/step_02.ngdoc index 1715990b..abed3977 100644 --- a/docs/content/tutorial/step_02.ngdoc +++ b/docs/content/tutorial/step_02.ngdoc @@ -2,50 +2,36 @@ @name Tutorial: 2 - Angular Template @description - - - Now it's time to make this web page dynamic with angular. We'll also add a test that verifies the code for the controller we are going to add. - There are many ways to structure the code for an application. With angular, we encourage the use of {@link http://en.wikipedia.org/wiki/Model–View–Controller the MVC design pattern} to decouple the code and separate concerns. With that in mind, let's use a little angular and JavaScript to add model, view, and controller components to our app. - - - - The app now contains a list with 3 phones. - The most important changes are listed below. You can see the full diff on {@link https://github.com/angular/angular-phonecat/compare/step-1...step-2 GitHub}: - - ## Template for the View - The __view__ component is constructed by angular from this template: - __`app/index.html`:__ 
 ...
 
 
-
   
 
-
- We replaced the hard-coded phone list with the {@link api/angular.widget.@ng:repeat ng:repeat widget} and two {@link guide/dev_guide.expressions angular expressions} enclosed in curly braces: `{{phone.name}}` and `{{phone.snippet}}`: - * The `ng:repeat="phone in phones"` statement in the `
  • ` tag is an angular repeater. It tells angular to create a `
  • ` element for each phone in the phones list, using the first `
  • ` tag as the template. - - * 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 @@ -83,15 +64,11 @@ of the model through the HTML template. This means that whenever the model chang refreshes the appropriate binding points, which updates the view. - - ## Model and Controller - The data __model__ (a simple array of phones in object literal notation) is instantiated within the __controller__ function (`PhoneListCtrl`): - __`app/js/controllers.js`:__ 
     function PhoneListCtrl() {
@@ -107,22 +84,16 @@ function PhoneListCtrl() {
 
 
 
-
-
-
-
 Although the controller is not yet doing very much controlling, it is playing a crucial role. By
 providing context for our data model, the controller allows us to establish data-binding between
 the model and the view. Note in the following how we connected the dots between our presentation,
 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 `` 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 `` 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
@@ -131,23 +102,17 @@ reflected in the model. To learn more about angular scopes, see the {@link api/a
 angular scope documentation}.
 
 
-
-
 ## Tests
 
-
 The "Angular way" makes it easy for us to test as we develop; the unit test for your newly created
 controller looks as follows:
 
-
 __`test/unit/controllersSpec.js`:__
 
     describe('PhoneCat controllers', function() {
 
-
   describe('PhoneListCtrl', function() {
 
-
     it('should create "phones" model with 3 phones', function() {
       var ctrl = new PhoneListCtrl();
       expect(ctrl.phones.length).toBe(3);
@@ -156,105 +121,76 @@ describe('PhoneCat controllers', function() {
 });
 
    
 
-
 Ease of testing is another cornerstone of angular's design philosophy. All we are doing here is
 showing how easy it is to create a unit test. The test verifies that we have 3 records in the
 phones array.
 
-
 Angular developers prefer the syntax of Jasmine's Behavior-driven Development  (BDD) framework when
 writing tests. Although Jasmine is not required by angular, we used it to write all tests in this
 tutorial. You can learn about Jasmine on the {@link http://pivotal.github.com/jasmine/ Jasmine home
 page} and on the {@link https://github.com/pivotal/jasmine/wiki Jasmine wiki}.
 
-
 The angular-seed project is pre-configured to run all unit tests using {@link
 http://code.google.com/p/js-test-driver/ JsTestDriver}. To run the test, do the following:
 
-
 1. In a _separate_ terminal window or tab, go to the `angular-phonecat` directory and run
 `./scripts/test-server.sh` to start the test web server.
 
-
 2. Open a new browser tab or window and navigate to {@link http://localhost:9876}.
 
-
 3. Choose "Capture this browser in strict mode".
 
-
    At this point, you can leave this tab open and forget about it. JsTestDriver will use it to
 execute the tests and report the results in the terminal.
 
-
 4. Execute the test by running `./scripts/test.sh`
 
-
    You should see the following or similar output:
 
-
              Chrome: Runner reset.
              .
              Total 1 tests (Passed: 1; Fails: 0; Errors: 0) (2.00 ms)
                Chrome 11.0.696.57 Mac OS: Run 1 tests (Passed: 1; Fails: 0; Errors 0) (2.00 ms)
 
-
   Yay! The test passed! Or not...
 
-
   Note: If you see errors after you run the test, close the browser tab and go back to the terminal
 and kill the script, then repeat the procedure above.
 
-
 # Experiments
 
-
 * Add another binding to `index.html`. For example:
 
-
           
    Total number of phones: {{phones.length}}
    
 
-
 * Create a new model property in the controller and bind to it from the template. For example:
 
-
           this.hello = "Hello, World!"
 
-
   Refresh your browser to make sure it says, "Hello, World!"
 
-
 * Create a repeater that constructs a simple table:
 
-
           
    
             
    row number
    
             
    {{i}}
    
           
    
 
-
   Now, make the list 1-based by incrementing `i` by one in the binding:
 
-
           
    
             
    row number
    
             
    {{i+1}}
    
           
    
 
-
 * Make the unit test fail by changing the `toBe(3)` statement to `toBe(4)`, and rerun the
 `./scripts/test.sh` script.
 
 
-
-
 # Summary
 
-
 You now have a dynamic app that features separate model, view, and controller components, and
 you're testing as you go. Now, let's go to step 3 to learn how to add full text search to the app.
 
 
-
-
 
-
-- 
cgit v1.2.3