Skip to content

Commit 352875c

Browse files
Merge pull request #63 from angular/master
Update upstream
2 parents ee808b1 + c0adcc3 commit 352875c

File tree

17 files changed

+578
-262
lines changed

17 files changed

+578
-262
lines changed

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ It also helps with server-side communication, taming async callbacks with promis
1212
and it makes client-side navigation and deep linking with hashbang urls or HTML5 pushState a
1313
piece of cake. Best of all? It makes development fun!
1414

15+
--------------------
16+
17+
##### AngularJS will be moving to Long Term Support (LTS) mode on July 1st 2018: [Find out more](misc/version-support-status)
18+
19+
##### Looking for the new Angular? Go here: https://github.com/angular/angular
20+
21+
--------------------
22+
1523
* Web site: https://angularjs.org
1624
* Tutorial: https://docs.angularjs.org/tutorial
1725
* API Docs: https://docs.angularjs.org/api
@@ -20,7 +28,6 @@ piece of cake. Best of all? It makes development fun!
2028
* Core Development: [DEVELOPERS.md](DEVELOPERS.md)
2129
* Dashboard: https://dashboard.angularjs.org
2230

23-
##### Looking for the new Angular? Go here: https://github.com/angular/angular
2431

2532
Documentation
2633
--------------------

docs/app/assets/css/docs.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -934,6 +934,14 @@ toc-container > div > toc-tree > ul > li > toc-tree > ul > li toc-tree > ul li {
934934
font-size: 13px;
935935
}
936936

937+
.dev-status span {
938+
padding: 2px 8px;
939+
border-radius: 5px;
940+
}
941+
.security span { background-color: orange; }
942+
.stable span { background-color: green; color: white; }
943+
.current span { background-color: blue; color: white; }
944+
937945
@media handheld and (max-width:800px), screen and (max-device-width:800px), screen and (max-width:800px) {
938946
.navbar {
939947
min-height: auto;

docs/content/api/index.ngdoc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,15 @@
33
@description
44

55
# AngularJS API Docs
6-
Welcome to the AngularJS API docs page. These pages contain the AngularJS reference materials for version <strong ng-bind="version"></strong>.
6+
7+
<div class="alert alert-warning">
8+
**AngularJS will be moving to Long Term Support (LTS) mode on July 1st 2018.**: [Find out more](misc/version-support-status).
9+
</div>
10+
11+
## Welcome to the AngularJS API docs page.
12+
13+
These pages contain the AngularJS reference materials for version <strong ng-bind="version"></strong>.
14+
715

816
The documentation is organized into **{@link guide/module modules}** which contain various components of an AngularJS application.
917
These components are {@link guide/directive directives}, {@link guide/services services}, {@link guide/filter filters}, {@link guide/providers providers}, {@link guide/templates templates}, global APIs, and testing mocks.

docs/content/error/$compile/tpload.ngdoc

Lines changed: 0 additions & 11 deletions
This file was deleted.

docs/content/error/$parse/esc.ngdoc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@ngdoc error
2+
@name $parse:esc
3+
@fullName Value cannot be escaped
4+
@description
5+
6+
Occurs when the parser tries to escape a value that is not known.
7+
8+
This should never occur in practice. If it does then that indicates a programming
9+
error in the AngularJS `$parse` service itself and should be reported as an issue
10+
at https://github.com/angular/angular.js/issues.

docs/content/error/$parse/lval.ngdoc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
@ngdoc error
2+
@name $parse:lval
3+
@fullName Trying to assign a value to a non l-value
4+
@description
5+
6+
Occurs when an expression is trying to assign a value to a non-assignable expression.
7+
8+
This can happen if the left side of an assigment is not a valid reference to a variable
9+
or property. E.g. In the following snippet `1+2` is not assignable.
10+
11+
```
12+
(1+2) = 'hello';
13+
```
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
@ngdoc error
2+
@name $route:norout
3+
@fullName Tried updating route with no current route
4+
@description
5+
6+
Occurs when an attempt is made to update the parameters on the current route when
7+
there is no current route. This can happen if you try to call `$route.updateParams();`
8+
before the first route transition has completed.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
@ngdoc error
2+
@name $templateRequest:tpload
3+
@fullName Error Loading Template
4+
@description
5+
6+
This error occurs when {@link $templateRequest} attempts to fetch a template from some URL, and
7+
the request fails.
8+
9+
The template URL might be defined in a directive/component definition, an instance of `ngInclude`,
10+
an instance of `ngMessagesInclude` or a templated route in a `$route` route definition.
11+
12+
To resolve this error, ensure that the URL of the template is spelled correctly and resolves to
13+
correct absolute URL.
14+
The [Chrome Developer Tools](https://developers.google.com/chrome-developer-tools/docs/network#network_panel_overview)
15+
might also be helpful in determining why the request failed.
16+
17+
If you are using {@link ng.$templateCache} to pre-load templates, ensure that the cache was
18+
populated with the template.
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
@ngdoc overview
2+
@name Version Support Status
3+
@description
4+
5+
# Version Support Status
6+
7+
This page describes the support status of the significant versions of AngularJS.
8+
9+
<div class="alert alert-info">
10+
AngularJS is planning one more significant release, version 1.7, and on July 1, 2018 it will enter a 3 year Long Term Support period.
11+
</div>
12+
13+
### Until July 1st 2018
14+
15+
Any version branch not shown in the following table (e.g. 1.5.x) is no longer being developed.
16+
17+
<table class="dev-status table table-bordered">
18+
<thead>
19+
<tr><th>Version</th><th>Status</th><th>Comments</th></tr>
20+
</thead>
21+
<tbody>
22+
<tr class="security"><td><span>1.2.x</span></td><td>Security patches only</td><td>Last version to provide IE 8 support</td></tr>
23+
<tr class="stable"><td><span>1.6.x</span></td><td>Patch Releases</td><td>Minor features, bug fixes, security patches - no breaking changes</td></tr>
24+
<tr class="current"><td><span>1.7.x</span></td><td>Active Development</td><td>1.7.0 (not yet released) will be the last release of AngularJS to contain breaking changes</td></tr>
25+
</tbody>
26+
</table>
27+
28+
### After July 1st 2018
29+
30+
Any version branch not shown in the following table (e.g. 1.6.x) is no longer being developed.
31+
32+
<table class="dev-status table table-bordered">
33+
<thead>
34+
<tr><th>Version</th><th>Status</th><th>Comments</th></tr>
35+
</thead>
36+
<tbody>
37+
<tr class="security"><td><span>1.2.x</span></td><td>Long Term Support</td><td>Last version to provide IE 8 support</td></tr>
38+
<tr class="stable"><td><span>1.7.x</span></td><td>Long Term Support</td><td>See [Long Term Support](#long-term-support) section below.</td></tr>
39+
</tbody>
40+
</table>
41+
42+
### Long Term Support
43+
44+
On July 1st 2018, we will enter a Long Term Support period for AngularJS.
45+
46+
At this time we will focus exclusively on providing fixes to bugs that satisfy at least one of the following criteria:
47+
48+
* A security flaw is detected in the 1.7.x branch of the framework
49+
* One of the major browsers releases a version that will cause current production applications using AngularJS 1.7.x to stop working
50+
* The jQuery library releases a version that will cause current production applications using AngularJS 1.7.x to stop working.
51+
52+
### Blog Post
53+
54+
You can read more about these plans in our [blog post announcement](https://blog.angular.io/stable-angularjs-and-long-term-support-7e077635ee9c).

src/ng/compile.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1014,11 +1014,13 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
10141014
var bindingCache = createMap();
10151015

10161016
function parseIsolateBindings(scope, directiveName, isController) {
1017-
var LOCAL_REGEXP = /^\s*([@&<]|=(\*?))(\??)\s*([\w$]*)\s*$/;
1017+
var LOCAL_REGEXP = /^([@&<]|=(\*?))(\??)\s*([\w$]*)$/;
10181018

10191019
var bindings = createMap();
10201020

10211021
forEach(scope, function(definition, scopeName) {
1022+
definition = definition.trim();
1023+
10221024
if (definition in bindingCache) {
10231025
bindings[scopeName] = bindingCache[definition];
10241026
return;

src/ng/templateRequest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var $templateRequestMinErr = minErr('$compile');
3+
var $templateRequestMinErr = minErr('$templateRequest');
44

55
/**
66
* @ngdoc provider

0 commit comments

Comments
 (0)