doc($route): fix $route example and couple of typos

Rewrite $route example a bit, as it required $location and $route services
to be eager published in the root scope.

Fix small typos in formatter and ng:options docs.
This commit is contained in:
Vojta Jina 2011-07-02 01:38:03 +02:00
parent ce80576e0b
commit 7e2e7b07b6
5 changed files with 30 additions and 21 deletions

2
docs/examples/book.html Normal file
View file

@ -0,0 +1,2 @@
controller: {{name}}<br />
Book Id: {{params.bookId}}<br />

View file

@ -0,0 +1,3 @@
controller: {{name}}<br />
Book Id: {{prams.bookId}}<br />
Chapter Id: {{params.chapterId}}

View file

@ -13,8 +13,8 @@
* * {@link angular.formatter.index index} - Manages indexing into an HTML select widget * * {@link angular.formatter.index index} - Manages indexing into an HTML select widget
* * {@link angular.formatter.json json} - Formats user input in JSON format * * {@link angular.formatter.json json} - Formats user input in JSON format
* * {@link angular.formatter.list list} - Formats user input string as an array * * {@link angular.formatter.list list} - Formats user input string as an array
* * {@link angular.formatter.number} - Formats user input strings as a number * * {@link angular.formatter.number number} - Formats user input strings as a number
* * {@link angular.formatter.trim} - Trims extras spaces from end of user input * * {@link angular.formatter.trim trim} - Trims extras spaces from end of user input
* *
* For more information about how angular formatters work, and how to create your own formatters, * For more information about how angular formatters work, and how to create your own formatters,
* see {@link guide/dev_guide.templates.formatters Understanding Angular Formatters} in the angular * see {@link guide/dev_guide.templates.formatters Understanding Angular Formatters} in the angular

View file

@ -22,13 +22,16 @@
<doc:example> <doc:example>
<doc:source> <doc:source>
<script> <script>
angular.service('myApp', function($route) { function MainCntl($route, $location) {
$route.when('/Book/:bookId', {template:'rsrc/book.html', controller:BookCntl}); this.$route = $route;
$route.when('/Book/:bookId/ch/:chapterId', {template:'rsrc/chapter.html', controller:ChapterCntl}); this.$location = $location;
$route.when('/Book/:bookId', {template: 'examples/book.html', controller: BookCntl});
$route.when('/Book/:bookId/ch/:chapterId', {template: 'examples/chapter.html', controller: ChapterCntl});
$route.onChange(function() { $route.onChange(function() {
$route.current.scope.params = $route.current.params; $route.current.scope.params = $route.current.params;
}); });
}, {$inject: ['$route']}); }
function BookCntl() { function BookCntl() {
this.name = "BookCntl"; this.name = "BookCntl";
@ -39,18 +42,19 @@
} }
</script> </script>
Chose: <div ng:controller="MainCntl">
<a href="#/Book/Moby">Moby</a> | Choose:
<a href="#/Book/Moby/ch/1">Moby: Ch1</a> | <a href="#/Book/Moby">Moby</a> |
<a href="#/Book/Gatsby">Gatsby</a> | <a href="#/Book/Moby/ch/1">Moby: Ch1</a> |
<a href="#/Book/Gatsby/ch/4?key=value">Gatsby: Ch4</a><br/> <a href="#/Book/Gatsby">Gatsby</a> |
<input type="text" name="$location.hashPath" size="80" /> <a href="#/Book/Gatsby/ch/4?key=value">Gatsby: Ch4</a><br/>
<pre>$location={{$location}}</pre> $location.hashPath: <input type="text" name="$location.hashPath" size="80" />
<pre>$route.current.template={{$route.current.template}}</pre> <pre>$route.current.template = {{$route.current.template}}</pre>
<pre>$route.current.params={{$route.current.params}}</pre> <pre>$route.current.params = {{$route.current.params}}</pre>
<pre>$route.current.scope.name={{$route.current.scope.name}}</pre> <pre>$route.current.scope.name = {{$route.current.scope.name}}</pre>
<hr/> <hr />
<ng:include src="$route.current.template" scope="$route.current.scope"/> <ng:view></ng:view>
</div>
</doc:source> </doc:source>
<doc:scenario> <doc:scenario>
</doc:scenario> </doc:scenario>

View file

@ -597,9 +597,9 @@ angularWidget('button', inputWidgetSelector);
* @param {comprehension_expression} comprehension _expresion_ `for` _item_ `in` _array_. * @param {comprehension_expression} comprehension _expresion_ `for` _item_ `in` _array_.
* *
* * _array_: an expression which evaluates to an array of objects to bind. * * _array_: an expression which evaluates to an array of objects to bind.
* * _item_: local variable which will reffer to the item in the _array_ during the itteration * * _item_: local variable which will refer to the item in the _array_ during the iteration
* * _expression_: The result of this expression will is `option` label. The * * _expression_: The result of this expression will be `option` label. The
* `expression` most likely reffers to the _item_ varibale. * `expression` most likely refers to the _item_ variable.
* *
* @example * @example
<doc:example> <doc:example>