diff options
Diffstat (limited to 'docs/content/cookbook')
| -rw-r--r-- | docs/content/cookbook/advancedform.ngdoc | 30 | ||||
| -rw-r--r-- | docs/content/cookbook/buzz.ngdoc | 20 | ||||
| -rw-r--r-- | docs/content/cookbook/deeplinking.ngdoc | 8 | ||||
| -rw-r--r-- | docs/content/cookbook/form.ngdoc | 28 | ||||
| -rw-r--r-- | docs/content/cookbook/helloworld.ngdoc | 4 | ||||
| -rw-r--r-- | docs/content/cookbook/mvc.ngdoc | 12 |
6 files changed, 51 insertions, 51 deletions
diff --git a/docs/content/cookbook/advancedform.ngdoc b/docs/content/cookbook/advancedform.ngdoc index 58a8dfd5..37c5da0d 100644 --- a/docs/content/cookbook/advancedform.ngdoc +++ b/docs/content/cookbook/advancedform.ngdoc @@ -58,35 +58,35 @@ detection, and preventing invalid form submission. $scope.cancel(); } </script> - <div ng:controller="UserForm"> + <div ng-controller="UserForm"> <form name="myForm"> <label>Name:</label><br/> - <input type="text" ng:model="form.name" required/> <br/><br/> + <input type="text" ng-model="form.name" required/> <br/><br/> <label>Address:</label> <br/> - <input type="text" ng:model="form.address.line1" size="33" required/> <br/> - <input type="text" ng:model="form.address.city" size="12" required/>, - <input type="text" ng:model="form.address.state" size="2" - ng:pattern="state" required/> - <input type="text" ng:model="form.address.zip" size="5" - ng:pattern="zip" required/><br/><br/> + <input type="text" ng-model="form.address.line1" size="33" required/> <br/> + <input type="text" ng-model="form.address.city" size="12" required/>, + <input type="text" ng-model="form.address.state" size="2" + ng-pattern="state" required/> + <input type="text" ng-model="form.address.zip" size="5" + ng-pattern="zip" required/><br/><br/> <label>Contacts:</label> - [ <a href="" ng:click="addContact()">add</a> ] - <div ng:repeat="contact in form.contacts"> - <select ng:model="contact.type"> + [ <a href="" ng-click="addContact()">add</a> ] + <div ng-repeat="contact in form.contacts"> + <select ng-model="contact.type"> <option>email</option> <option>phone</option> <option>pager</option> <option>IM</option> </select> - <input type="text" ng:model="contact.value" required/> - [ <a href="" ng:click="removeContact(contact)">X</a> ] + <input type="text" ng-model="contact.value" required/> + [ <a href="" ng-click="removeContact(contact)">X</a> ] </div> - <button ng:click="cancel()" ng:disabled="{{isCancelDisabled()}}">Cancel</button> - <button ng:click="save()" ng:disabled="{{isSaveDisabled()}}">Save</button> + <button ng-click="cancel()" ng-disabled="{{isCancelDisabled()}}">Cancel</button> + <button ng-click="save()" ng-disabled="{{isSaveDisabled()}}">Save</button> </form> <hr/> diff --git a/docs/content/cookbook/buzz.ngdoc b/docs/content/cookbook/buzz.ngdoc index ca6a22b4..bf900223 100644 --- a/docs/content/cookbook/buzz.ngdoc +++ b/docs/content/cookbook/buzz.ngdoc @@ -31,22 +31,22 @@ to retrieve Buzz activity and comments. } }; </script> - <div ng:controller="BuzzController"> - <input ng:model="userId"/> - <button ng:click="fetch()">fetch</button> + <div ng-controller="BuzzController"> + <input ng-model="userId"/> + <button ng-click="fetch()">fetch</button> <hr/> - <div class="buzz" ng:repeat="item in activities.data.items"> + <div class="buzz" ng-repeat="item in activities.data.items"> <h1 style="font-size: 15px;"> - <img ng:src="{{item.actor.thumbnailUrl}}" style="max-height:30px;max-width:30px;"/> - <a ng:href="{{item.actor.profileUrl}}">{{item.actor.name}}</a> - <a href ng:click="expandReplies(item)" style="float: right;"> + <img ng-src="{{item.actor.thumbnailUrl}}" style="max-height:30px;max-width:30px;"/> + <a ng-href="{{item.actor.profileUrl}}">{{item.actor.name}}</a> + <a href ng-click="expandReplies(item)" style="float: right;"> Expand replies: {{item.links.replies[0].count}} </a> </h1> {{item.object.content | html}} - <div class="reply" ng:repeat="reply in item.replies.data.items" style="margin-left: 20px;"> - <img ng:src="{{reply.actor.thumbnailUrl}}" style="max-height:30px;max-width:30px;"/> - <a ng:href="{{reply.actor.profileUrl}}">{{reply.actor.name}}</a>: + <div class="reply" ng-repeat="reply in item.replies.data.items" style="margin-left: 20px;"> + <img ng-src="{{reply.actor.thumbnailUrl}}" style="max-height:30px;max-width:30px;"/> + <a ng-href="{{reply.actor.profileUrl}}">{{reply.actor.name}}</a>: {{reply.content | html}} </div> </div> diff --git a/docs/content/cookbook/deeplinking.ngdoc b/docs/content/cookbook/deeplinking.ngdoc index 4db8d1c7..db5f057e 100644 --- a/docs/content/cookbook/deeplinking.ngdoc +++ b/docs/content/cookbook/deeplinking.ngdoc @@ -33,8 +33,8 @@ In this example we have a simple app which consist of two screens: The two partials are defined in the following URLs: -* <a href="./examples/settings.html" ng:ext-link>./examples/settings.html</a> -* <a href="./examples/welcome.html" ng:ext-link>./examples/welcome.html</a> +* <a href="./examples/settings.html" ng-ext-link>./examples/settings.html</a> +* <a href="./examples/welcome.html" ng-ext-link>./examples/welcome.html</a> <doc:example module="deepLinking"> <doc:source jsfiddle="false"> @@ -73,7 +73,7 @@ The two partials are defined in the following URLs: $scope.cancel(); } </script> - <div ng:controller="AppCntl"> + <div ng-controller="AppCntl"> <h1>Your App Chrome</h1> [ <a href="welcome">Welcome</a> | <a href="settings">Settings</a> ] <hr/> @@ -106,7 +106,7 @@ The two partials are defined in the following URLs: routes. * The {@link api/angular.module.ng.$route $route} service then watches the URL and instantiates the appropriate controller when the URL changes. -* The {@link api/angular.module.ng.$compileProvider.directive.ng:view ng:view} widget loads the +* The {@link api/angular.module.ng.$compileProvider.directive.ng-view ng-view} widget loads the view when the URL changes. It also sets the view scope to the newly instantiated controller. * Changing the URL is sufficient to change the controller and view. It makes no difference whether the URL is changed programatically or by the user. diff --git a/docs/content/cookbook/form.ngdoc b/docs/content/cookbook/form.ngdoc index b811a1fc..afb30e36 100644 --- a/docs/content/cookbook/form.ngdoc +++ b/docs/content/cookbook/form.ngdoc @@ -32,30 +32,30 @@ allow a user to enter data. }; } </script> - <div ng:controller="FormController" class="example"> + <div ng-controller="FormController" class="example"> <label>Name:</label><br/> - <input type="text" ng:model="user.name" required/> <br/><br/> + <input type="text" ng-model="user.name" required/> <br/><br/> <label>Address:</label><br/> - <input type="text" ng:model="user.address.line1" size="33" required> <br/> - <input type="text" ng:model="user.address.city" size="12" required>, - <input type="text" ng:model="user.address.state" size="2" - ng:pattern="state" required> - <input type="text" ng:model="user.address.zip" size="5" - ng:pattern="zip" required><br/><br/> + <input type="text" ng-model="user.address.line1" size="33" required> <br/> + <input type="text" ng-model="user.address.city" size="12" required>, + <input type="text" ng-model="user.address.state" size="2" + ng-pattern="state" required> + <input type="text" ng-model="user.address.zip" size="5" + ng-pattern="zip" required><br/><br/> <label>Phone:</label> - [ <a href="" ng:click="addContact()">add</a> ] - <div ng:repeat="contact in user.contacts"> - <select ng:model="contact.type"> + [ <a href="" ng-click="addContact()">add</a> ] + <div ng-repeat="contact in user.contacts"> + <select ng-model="contact.type"> <option>email</option> <option>phone</option> <option>pager</option> <option>IM</option> </select> - <input type="text" ng:model="contact.value" required/> - [ <a href="" ng:click="removeContact(contact)">X</a> ] + <input type="text" ng-model="contact.value" required/> + [ <a href="" ng-click="removeContact(contact)">X</a> ] </div> <hr/> Debug View: @@ -102,7 +102,7 @@ allow a user to enter data. # Things to notice -* The user data model is initialized {@link api/angular.module.ng.$compileProvider.directive.ng:controller controller} and is +* The user data model is initialized {@link api/angular.module.ng.$compileProvider.directive.ng-controller controller} and is available in the {@link api/angular.module.ng.$rootScope.Scope scope} with the initial data. * For debugging purposes we have included a debug view of the model to better understand what is going on. diff --git a/docs/content/cookbook/helloworld.ngdoc b/docs/content/cookbook/helloworld.ngdoc index 0d9f882a..629a3893 100644 --- a/docs/content/cookbook/helloworld.ngdoc +++ b/docs/content/cookbook/helloworld.ngdoc @@ -9,8 +9,8 @@ $scope.name = 'World'; } </script> - <div ng:controller="HelloCntl"> - Your name: <input type="text" ng:model="name" value="World"/> + <div ng-controller="HelloCntl"> + Your name: <input type="text" ng-model="name" value="World"/> <hr/> Hello {{name}}! </div> diff --git a/docs/content/cookbook/mvc.ngdoc b/docs/content/cookbook/mvc.ngdoc index cdb5ebdc..92033352 100644 --- a/docs/content/cookbook/mvc.ngdoc +++ b/docs/content/cookbook/mvc.ngdoc @@ -80,16 +80,16 @@ no connection between the controller and the view. </script> <h3>Tic-Tac-Toe</h3> - <div ng:controller="TicTacToeCntl"> + <div ng-controller="TicTacToeCntl"> Next Player: {{nextMove}} - <div class="winner" ng:show="winner">Player {{winner}} has won!</div> + <div class="winner" ng-show="winner">Player {{winner}} has won!</div> <table class="board"> - <tr ng:repeat="row in board" style="height:15px;"> - <td ng:repeat="cell in row" ng:style="cellStyle" - ng:click="dropPiece($parent.$index, $index)">{{cell}}</td> + <tr ng-repeat="row in board" style="height:15px;"> + <td ng-repeat="cell in row" ng-style="cellStyle" + ng-click="dropPiece($parent.$index, $index)">{{cell}}</td> </tr> </table> - <button ng:click="reset()">reset board</button> + <button ng-click="reset()">reset board</button> </div> </doc:source> <doc:scenario> |