aboutsummaryrefslogtreecommitdiffstats
path: root/src/service
diff options
context:
space:
mode:
Diffstat (limited to 'src/service')
-rw-r--r--src/service/compiler.js6
-rw-r--r--src/service/filter/filter.js14
-rw-r--r--src/service/filter/filters.js26
-rw-r--r--src/service/filter/limitTo.js6
-rw-r--r--src/service/filter/orderBy.js14
-rw-r--r--src/service/http.js14
-rw-r--r--src/service/location.js2
-rw-r--r--src/service/log.js12
-rw-r--r--src/service/resource.js12
-rw-r--r--src/service/route.js18
-rw-r--r--src/service/sanitize.js16
-rw-r--r--src/service/scope.js4
-rw-r--r--src/service/window.js4
13 files changed, 74 insertions, 74 deletions
diff --git a/src/service/compiler.js b/src/service/compiler.js
index 42c694ff..5fb9035d 100644
--- a/src/service/compiler.js
+++ b/src/service/compiler.js
@@ -15,7 +15,7 @@
* instance functions into a single template function which is then returned.
*
* The template function can then be used once to produce the view or as it is the case with
- * {@link angular.module.ng.$compileProvider.directive.ng:repeat repeater} many-times, in which
+ * {@link angular.module.ng.$compileProvider.directive.ng-repeat repeater} many-times, in which
* case each call results in a view that is a DOM clone of the original template.
*
<doc:example module="compile">
@@ -55,8 +55,8 @@
}
</script>
<div ng-controller="Ctrl">
- <input ng:model="name"> <br>
- <textarea ng:model="html"></textarea> <br>
+ <input ng-model="name"> <br>
+ <textarea ng-model="html"></textarea> <br>
<div compile="html"></div>
</div>
</doc:source>
diff --git a/src/service/filter/filter.js b/src/service/filter/filter.js
index 49960546..9a62b484 100644
--- a/src/service/filter/filter.js
+++ b/src/service/filter/filter.js
@@ -35,27 +35,27 @@
* @example
<doc:example>
<doc:source>
- <div ng:init="friends = [{name:'John', phone:'555-1276'},
+ <div ng-init="friends = [{name:'John', phone:'555-1276'},
{name:'Mary', phone:'800-BIG-MARY'},
{name:'Mike', phone:'555-4321'},
{name:'Adam', phone:'555-5678'},
{name:'Julie', phone:'555-8765'}]"></div>
- Search: <input ng:model="searchText"/>
+ Search: <input ng-model="searchText"/>
<table id="searchTextResults">
<tr><th>Name</th><th>Phone</th><tr>
- <tr ng:repeat="friend in friends | filter:searchText">
+ <tr ng-repeat="friend in friends | filter:searchText">
<td>{{friend.name}}</td>
<td>{{friend.phone}}</td>
<tr>
</table>
<hr>
- Any: <input ng:model="search.$"/> <br>
- Name only <input ng:model="search.name"/><br>
- Phone only <input ng:model="search.phone"/><br>
+ Any: <input ng-model="search.$"/> <br>
+ Name only <input ng-model="search.name"/><br>
+ Phone only <input ng-model="search.phone"/><br>
<table id="searchObjResults">
<tr><th>Name</th><th>Phone</th><tr>
- <tr ng:repeat="friend in friends | filter:search">
+ <tr ng-repeat="friend in friends | filter:search">
<td>{{friend.name}}</td>
<td>{{friend.phone}}</td>
<tr>
diff --git a/src/service/filter/filters.js b/src/service/filter/filters.js
index 58a3a869..2b1fe533 100644
--- a/src/service/filter/filters.js
+++ b/src/service/filter/filters.js
@@ -22,8 +22,8 @@
$scope.amount = 1234.56;
}
</script>
- <div ng:controller="Ctrl">
- <input type="number" ng:model="amount"/> <br/>
+ <div ng-controller="Ctrl">
+ <input type="number" ng-model="amount"/> <br/>
default currency symbol ($): {{amount | currency}}<br/>
custom currency identifier (USD$): {{amount | currency:"USD$"}}
</div>
@@ -73,8 +73,8 @@ function currencyFilter($locale) {
$scope.val = 1234.56789;
}
</script>
- <div ng:controller="Ctrl">
- Enter number: <input ng:model='val'><br/>
+ <div ng-controller="Ctrl">
+ Enter number: <input ng-model='val'><br/>
Default formatting: {{val | number}}<br/>
No fractions: {{val | number:0}}<br/>
Negative number: {{-val | number:4}}
@@ -296,11 +296,11 @@ var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+
* @example
<doc:example>
<doc:source>
- <span ng:non-bindable>{{1288323623006 | date:'medium'}}</span>:
+ <span ng-non-bindable>{{1288323623006 | date:'medium'}}</span>:
{{1288323623006 | date:'medium'}}<br/>
- <span ng:non-bindable>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span>:
+ <span ng-non-bindable>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span>:
{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}<br/>
- <span ng:non-bindable>{{1288323623006 | date:'MM/dd/yyyy @ h:mma'}}</span>:
+ <span ng-non-bindable>{{1288323623006 | date:'MM/dd/yyyy @ h:mma'}}</span>:
{{'1288323623006' | date:'MM/dd/yyyy @ h:mma'}}<br/>
</doc:source>
<doc:scenario>
@@ -445,8 +445,8 @@ var uppercaseFilter = valueFn(uppercase);
'and one more: ftp://127.0.0.1/.';
}
</script>
- <div ng:controller="Ctrl">
- Snippet: <textarea ng:model="snippet" cols="60" rows="3"></textarea>
+ <div ng-controller="Ctrl">
+ Snippet: <textarea ng-model="snippet" cols="60" rows="3"></textarea>
<table>
<tr>
<td>Filter</td>
@@ -456,16 +456,16 @@ var uppercaseFilter = valueFn(uppercase);
<tr id="linky-filter">
<td>linky filter</td>
<td>
- <pre>&lt;div ng:bind-html="snippet | linky"&gt;<br/>&lt;/div&gt;</pre>
+ <pre>&lt;div ng-bind-html="snippet | linky"&gt;<br/>&lt;/div&gt;</pre>
</td>
<td>
- <div ng:bind-html="snippet | linky"></div>
+ <div ng-bind-html="snippet | linky"></div>
</td>
</tr>
<tr id="escaped-html">
<td>no filter</td>
- <td><pre>&lt;div ng:bind="snippet"&gt;<br/>&lt;/div&gt;</pre></td>
- <td><div ng:bind="snippet"></div></td>
+ <td><pre>&lt;div ng-bind="snippet"&gt;<br/>&lt;/div&gt;</pre></td>
+ <td><div ng-bind="snippet"></div></td>
</tr>
</table>
</doc:source>
diff --git a/src/service/filter/limitTo.js b/src/service/filter/limitTo.js
index eb97fdad..032a8d61 100644
--- a/src/service/filter/limitTo.js
+++ b/src/service/filter/limitTo.js
@@ -30,14 +30,14 @@
$scope.limit = 3;
}
</script>
- <div ng:controller="Ctrl">
- Limit {{numbers}} to: <input type="integer" ng:model="limit"/>
+ <div ng-controller="Ctrl">
+ Limit {{numbers}} to: <input type="integer" ng-model="limit"/>
<p>Output: {{ numbers | limitTo:limit | json }}</p>
</div>
</doc:source>
<doc:scenario>
it('should limit the numer array to first three items', function() {
- expect(element('.doc-example-live input[ng\\:model=limit]').val()).toBe('3');
+ expect(element('.doc-example-live input[ng-model=limit]').val()).toBe('3');
expect(binding('numbers | limitTo:limit | json')).toEqual('[1,2,3]');
});
diff --git a/src/service/filter/orderBy.js b/src/service/filter/orderBy.js
index e7528a4b..3f4fe395 100644
--- a/src/service/filter/orderBy.js
+++ b/src/service/filter/orderBy.js
@@ -42,18 +42,18 @@
$scope.predicate = '-age';
}
</script>
- <div ng:controller="Ctrl">
+ <div ng-controller="Ctrl">
<pre>Sorting predicate = {{predicate}}; reverse = {{reverse}}</pre>
<hr/>
- [ <a href="" ng:click="predicate=''">unsorted</a> ]
+ [ <a href="" ng-click="predicate=''">unsorted</a> ]
<table class="friend">
<tr>
- <th><a href="" ng:click="predicate = 'name'; reverse=false">Name</a>
- (<a href ng:click="predicate = '-name'; reverse=false">^</a>)</th>
- <th><a href="" ng:click="predicate = 'phone'; reverse=!reverse">Phone Number</a></th>
- <th><a href="" ng:click="predicate = 'age'; reverse=!reverse">Age</a></th>
+ <th><a href="" ng-click="predicate = 'name'; reverse=false">Name</a>
+ (<a href ng-click="predicate = '-name'; reverse=false">^</a>)</th>
+ <th><a href="" ng-click="predicate = 'phone'; reverse=!reverse">Phone Number</a></th>
+ <th><a href="" ng-click="predicate = 'age'; reverse=!reverse">Age</a></th>
<tr>
- <tr ng:repeat="friend in friends | orderBy:predicate:reverse">
+ <tr ng-repeat="friend in friends | orderBy:predicate:reverse">
<td>{{friend.name}}</td>
<td>{{friend.phone}}</td>
<td>{{friend.age}}</td>
diff --git a/src/service/http.js b/src/service/http.js
index afaae2de..5dd87d76 100644
--- a/src/service/http.js
+++ b/src/service/http.js
@@ -420,16 +420,16 @@ function $HttpProvider() {
};
}
</script>
- <div ng:controller="FetchCtrl">
- <select ng:model="method">
+ <div ng-controller="FetchCtrl">
+ <select ng-model="method">
<option>GET</option>
<option>JSONP</option>
</select>
- <input type="text" ng:model="url" size="80"/>
- <button ng:click="fetch()">fetch</button><br>
- <button ng:click="updateModel('GET', 'examples/http-hello.html')">Sample GET</button>
- <button ng:click="updateModel('JSONP', 'http://angularjs.org/greet.php?callback=JSON_CALLBACK&name=Super%20Hero')">Sample JSONP</button>
- <button ng:click="updateModel('JSONP', 'http://angularjs.org/doesntexist&callback=JSON_CALLBACK')">Invalid JSONP</button>
+ <input type="text" ng-model="url" size="80"/>
+ <button ng-click="fetch()">fetch</button><br>
+ <button ng-click="updateModel('GET', 'examples/http-hello.html')">Sample GET</button>
+ <button ng-click="updateModel('JSONP', 'http://angularjs.org/greet.php?callback=JSON_CALLBACK&name=Super%20Hero')">Sample JSONP</button>
+ <button ng-click="updateModel('JSONP', 'http://angularjs.org/doesntexist&callback=JSON_CALLBACK')">Invalid JSONP</button>
<pre>http status code: {{status}}</pre>
<pre>http response data: {{data}}</pre>
</div>
diff --git a/src/service/location.js b/src/service/location.js
index 43e6ce52..a7ff103b 100644
--- a/src/service/location.js
+++ b/src/service/location.js
@@ -501,7 +501,7 @@ function $LocationProvider(){
}
var href = elm.attr('href');
- if (!href || isDefined(elm.attr('ng:ext-link')) || elm.attr('target')) return;
+ if (!href || isDefined(elm.attr('ng-ext-link')) || elm.attr('target')) return;
// remove same domain from full url links (IE7 always returns full hrefs)
href = href.replace(absUrlPrefix, '');
diff --git a/src/service/log.js b/src/service/log.js
index d6566140..76413618 100644
--- a/src/service/log.js
+++ b/src/service/log.js
@@ -20,14 +20,14 @@
this.message = 'Hello World!';
}
</script>
- <div ng:controller="LogCtrl">
+ <div ng-controller="LogCtrl">
<p>Reload this page with open console, enter text and hit the log button...</p>
Message:
- <input type="text" ng:model="message"/>
- <button ng:click="$log.log(message)">log</button>
- <button ng:click="$log.warn(message)">warn</button>
- <button ng:click="$log.info(message)">info</button>
- <button ng:click="$log.error(message)">error</button>
+ <input type="text" ng-model="message"/>
+ <button ng-click="$log.log(message)">log</button>
+ <button ng-click="$log.warn(message)">warn</button>
+ <button ng-click="$log.info(message)">info</button>
+ <button ng-click="$log.error(message)">error</button>
</div>
</doc:source>
<doc:scenario>
diff --git a/src/service/resource.js b/src/service/resource.js
index d2b722c2..790d5ed6 100644
--- a/src/service/resource.js
+++ b/src/service/resource.js
@@ -178,18 +178,18 @@
BuzzController.$inject = ['$resource'];
</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 ng:repeat="item in activities.data.items">
+ <div ng-repeat="item in activities.data.items">
<h1 style="font-size: 15px;">
<img src="{{item.actor.thumbnailUrl}}" style="max-height:30px;max-width:30px;"/>
<a 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>
+ <a href ng-click="expandReplies(item)" style="float: right;">Expand replies: {{item.links.replies[0].count}}</a>
</h1>
{{item.object.content | html}}
- <div ng:repeat="reply in item.replies.data.items" style="margin-left: 20px;">
+ <div ng-repeat="reply in item.replies.data.items" style="margin-left: 20px;">
<img src="{{reply.actor.thumbnailUrl}}" style="max-height:30px;max-width:30px;"/>
<a href="{{reply.actor.profileUrl}}">{{reply.actor.name}}</a>: {{reply.content | html}}
</div>
diff --git a/src/service/route.js b/src/service/route.js
index 3b135e65..3e9cbb41 100644
--- a/src/service/route.js
+++ b/src/service/route.js
@@ -27,8 +27,8 @@ function $RouteProvider(){
* - `controller` – `{function()=}` – Controller fn that should be associated with newly
* created scope.
* - `template` – `{string=}` – path to an html template that should be used by
- * {@link angular.module.ng.$compileProvider.directive.ng:view ng:view} or
- * {@link angular.module.ng.$compileProvider.directive.ng:include ng:include} widgets.
+ * {@link angular.module.ng.$compileProvider.directive.ng-view ng-view} or
+ * {@link angular.module.ng.$compileProvider.directive.ng-include ng-include} widgets.
* - `redirectTo` – {(string|function())=} – value to update
* {@link angular.module.ng.$location $location} path with and trigger route redirection.
*
@@ -94,12 +94,12 @@ function $RouteProvider(){
*
* You can define routes through {@link angular.module.ng.$routeProvider $routeProvider}'s API.
*
- * The `$route` service is typically used in conjunction with {@link angular.module.ng.$compileProvider.directive.ng:view ng:view}
+ * The `$route` service is typically used in conjunction with {@link angular.module.ng.$compileProvider.directive.ng-view ng-view}
* directive and the {@link angular.module.ng.$routeParams $routeParams} service.
*
* @example
This example shows how changing the URL hash causes the `$route` to match a route against the
- URL, and the `ng:view` pulls in the partial.
+ URL, and the `ng-view` pulls in the partial.
Note that this example is using {@link angular.module.ng.$compileProvide.directive.script inlined templates}
to get it working on jsfiddle as well.
@@ -143,7 +143,7 @@ function $RouteProvider(){
}
</script>
- <div ng:controller="MainCntl">
+ <div ng-controller="MainCntl">
Choose:
<a href="/Book/Moby">Moby</a> |
<a href="/Book/Moby/ch/1">Moby: Ch1</a> |
@@ -151,7 +151,7 @@ function $RouteProvider(){
<a href="/Book/Gatsby/ch/4?key=value">Gatsby: Ch4</a> |
<a href="/Book/Scarlet">Scarlet Letter</a><br/>
- <ng:view></ng:view>
+ <div ng-view></div>
<hr />
<pre>$location.path() = {{$location.path()}}</pre>
@@ -164,13 +164,13 @@ function $RouteProvider(){
<doc:scenario>
it('should load and compile correct template', function() {
element('a:contains("Moby: Ch1")').click();
- var content = element('.doc-example-live ng\\:view').text();
+ var content = element('.doc-example-live [ng-view]').text();
expect(content).toMatch(/controller\: ChapterCntl/);
expect(content).toMatch(/Book Id\: Moby/);
expect(content).toMatch(/Chapter Id\: 1/);
element('a:contains("Scarlet")').click();
- content = element('.doc-example-live ng\\:view').text();
+ content = element('.doc-example-live [ng-view]').text();
expect(content).toMatch(/controller\: BookCntl/);
expect(content).toMatch(/Book Id\: Scarlet/);
});
@@ -228,7 +228,7 @@ function $RouteProvider(){
* Causes `$route` service to reload the current route even if
* {@link angular.module.ng.$location $location} hasn't changed.
*
- * As a result of that, {@link angular.module.ng.$compileProvider.directive.ng:view ng:view}
+ * As a result of that, {@link angular.module.ng.$compileProvider.directive.ng-view ng-view}
* creates new scope, reinstantiates the controller.
*/
reload: function() {
diff --git a/src/service/sanitize.js b/src/service/sanitize.js
index 1446487c..7ca0711a 100644
--- a/src/service/sanitize.js
+++ b/src/service/sanitize.js
@@ -44,8 +44,8 @@
'snippet</p>';
}
</script>
- <div ng:controller="Ctrl">
- Snippet: <textarea ng:model="snippet" cols="60" rows="3"></textarea>
+ <div ng-controller="Ctrl">
+ Snippet: <textarea ng-model="snippet" cols="60" rows="3"></textarea>
<table>
<tr>
<td>Filter</td>
@@ -55,21 +55,21 @@
<tr id="html-filter">
<td>html filter</td>
<td>
- <pre>&lt;div ng:bind-html="snippet"&gt;<br/>&lt;/div&gt;</pre>
+ <pre>&lt;div ng-bind-html="snippet"&gt;<br/>&lt;/div&gt;</pre>
</td>
<td>
- <div ng:bind-html="snippet"></div>
+ <div ng-bind-html="snippet"></div>
</td>
</tr>
<tr id="escaped-html">
<td>no filter</td>
- <td><pre>&lt;div ng:bind="snippet"&gt;<br/>&lt;/div&gt;</pre></td>
- <td><div ng:bind="snippet"></div></td>
+ <td><pre>&lt;div ng-bind="snippet"&gt;<br/>&lt;/div&gt;</pre></td>
+ <td><div ng-bind="snippet"></div></td>
</tr>
<tr id="html-unsafe-filter">
<td>unsafe html filter</td>
- <td><pre>&lt;div ng:bind-html-unsafe="snippet"&gt;<br/>&lt;/div&gt;</pre></td>
- <td><div ng:bind-html-unsafe="snippet"></div></td>
+ <td><pre>&lt;div ng-bind-html-unsafe="snippet"&gt;<br/>&lt;/div&gt;</pre></td>
+ <td><div ng-bind-html-unsafe="snippet"></div></td>
</tr>
</table>
</div>
diff --git a/src/service/scope.js b/src/service/scope.js
index d5646008..24313620 100644
--- a/src/service/scope.js
+++ b/src/service/scope.js
@@ -329,7 +329,7 @@ function $RootScopeProvider(){
* `'Maximum iteration limit exceeded.'` if the number of iterations exceeds 100.
*
* Usually you don't call `$digest()` directly in
- * {@link angular.module.ng.$compileProvider.directive.ng:controller controllers} or in
+ * {@link angular.module.ng.$compileProvider.directive.ng-controller controllers} or in
* {@link angular.module.ng.$compileProvider.directive directives}.
* Instead a call to {@link angular.module.ng.$rootScope.Scope#$apply $apply()} (typically from within a
* {@link angular.module.ng.$compileProvider.directive directives}) will force a `$digest()`.
@@ -453,7 +453,7 @@ function $RootScopeProvider(){
* The destructing scope emits an `$destroy` {@link angular.module.ng.$rootScope.Scope#$emit event}.
*
* The `$destroy()` is usually used by directives such as
- * {@link angular.module.ng.$compileProvider.directive.ng:repeat ng:repeat} for managing the unrolling of the loop.
+ * {@link angular.module.ng.$compileProvider.directive.ng-repeat ng-repeat} for managing the unrolling of the loop.
*
*/
$destroy: function() {
diff --git a/src/service/window.js b/src/service/window.js
index 7bb3dfca..d7adea03 100644
--- a/src/service/window.js
+++ b/src/service/window.js
@@ -16,8 +16,8 @@
* @example
<doc:example>
<doc:source>
- <input ng:init="$window = $service('$window'); greeting='Hello World!'" type="text" ng:model="greeting" />
- <button ng:click="$window.alert(greeting)">ALERT</button>
+ <input ng-init="$window = $service('$window'); greeting='Hello World!'" type="text" ng-model="greeting" />
+ <button ng-click="$window.alert(greeting)">ALERT</button>
</doc:source>
<doc:scenario>
</doc:scenario>