Skip to content

Commit 73cc83b

Browse files
jesselpalmerjesselpalmer
committed
Merge pull request angular#11955 from jesselpalmer/updates-branch-with-master
Updates branch with master
2 parents 690c4e5 + 2618b7f commit 73cc83b

28 files changed

+2966
-2007
lines changed

‎CHANGELOG.md

Lines changed: 236 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,239 @@
1+
<a name="1.4.0"></a>
2+
# 1.4.0 jaracimrman-existence (2015-05-26)
3+
4+
5+
## Bug Fixes
6+
7+
- **$animate:**
8+
- ignore invalid option parameter values
9+
([72edd4df](https://github.com/angular/angular.js/commit/72edd4dff931c644eecb8f0d1c878dc839c76947),
10+
[#11826](https://github.com/angular/angular.js/issues/11826))
11+
- accept unwrapped DOM elements as inputs for enter + move
12+
([f26fc26f](https://github.com/angular/angular.js/commit/f26fc26f6ea283b2fc5ddb18627b13850de2663e),
13+
[#11848](https://github.com/angular/angular.js/issues/11848))
14+
- **$animateCss:** ensure that custom durations do not confuse the gcs cache
15+
([e0e1b520](https://github.com/angular/angular.js/commit/e0e1b5208767dd62f5586fdc607cb2e31dac9516),
16+
[#11723](https://github.com/angular/angular.js/issues/11723), [#11852](https://github.com/angular/angular.js/issues/11852))
17+
- **$http:** do not modify the config object passed into $http short methods
18+
([f7a4b481](https://github.com/angular/angular.js/commit/f7a4b48121ed2b04af89bd2b754f500d1872360d))
19+
- **ngAnimate:**
20+
- close follow-up class-based animations when the same class is added/removed when removed/added
21+
([db246eb7](https://github.com/angular/angular.js/commit/db246eb701529b41049fc118908e528920f13b24),
22+
[#11717](https://github.com/angular/angular.js/issues/11717))
23+
- ensure nested class-based animations are spaced out with a RAF
24+
([213c2a70](https://github.com/angular/angular.js/commit/213c2a703293ee0af8229dde2b608687cd77ccfa),
25+
[#11812](https://github.com/angular/angular.js/issues/11812))
26+
- class-based animations must not set addClass/removeClass CSS classes on the element
27+
([3a3db690](https://github.com/angular/angular.js/commit/3a3db690a16e888aa7371e3b02e2954b9ec2d558),
28+
[#11810](https://github.com/angular/angular.js/issues/11810))
29+
- ensure that repeated structural calls during pre-digest function
30+
([2327f5a0](https://github.com/angular/angular.js/commit/2327f5a0a7e018a9b03aefabe1fbd0c9330e2eeb),
31+
[#11867](https://github.com/angular/angular.js/issues/11867))
32+
- ensure that cancelled class-based animations are properly cleaned up
33+
([718ff844](https://github.com/angular/angular.js/commit/718ff84405558ac64402e1fca5caefd7d307ea1e),
34+
[#11652](https://github.com/angular/angular.js/issues/11652))
35+
- throw an error if a callback is passed to animate methods
36+
([9bb4d6cc](https://github.com/angular/angular.js/commit/9bb4d6ccbe80b7704c6b7f53317ca8146bc103ca),
37+
[#11826](https://github.com/angular/angular.js/issues/11826), [#11713](https://github.com/angular/angular.js/issues/11713))
38+
- ensure anchored animations remove the leave element at correct time
39+
([64c66d0e](https://github.com/angular/angular.js/commit/64c66d0eea11b575d2a71d00c70cfc5be12cd450),
40+
[#11850](https://github.com/angular/angular.js/issues/11850))
41+
- **select:** prevent unknown option being added to select when bound to null property
42+
([4090491c](https://github.com/angular/angular.js/commit/4090491c73910c169d4fba0494a4e26b45dca7ec),
43+
[#11872](https://github.com/angular/angular.js/issues/11872), [#11875](https://github.com/angular/angular.js/issues/11875))
44+
45+
46+
## Features
47+
48+
- **filterFilter:** allow array like objects to be filtered
49+
([1b0d0fd8](https://github.com/angular/angular.js/commit/1b0d0fd8d00b42dffd798845fe0947d594372613),
50+
[#11782](https://github.com/angular/angular.js/issues/11782), [#11787](https://github.com/angular/angular.js/issues/11787))
51+
52+
53+
54+
<a name="1.4.0-rc.2"></a>
55+
# 1.4.0-rc.2 rocket-zambonimation (2015-05-12)
56+
57+
58+
## Bug Fixes
59+
60+
- **$compile:** ensure directive names have no leading or trailing whitespace
61+
([bab474aa](https://github.com/angular/angular.js/commit/bab474aa8b146f6732857c3af1a8b3b010fda8b0),
62+
[#11397](https://github.com/angular/angular.js/issues/11397), [#11772](https://github.com/angular/angular.js/issues/11772))
63+
- **$httpParamSerializerJQLike:** follow jQuery logic for nested params
64+
([2420a0a7](https://github.com/angular/angular.js/commit/2420a0a77e27b530dbb8c41319b2995eccf76791),
65+
[#11551](https://github.com/angular/angular.js/issues/11551), [#11635](https://github.com/angular/angular.js/issues/11635))
66+
- **jqLite:** check for "length" in obj in isArrayLike to prevent iOS8 JIT bug from surfacing
67+
([426a5ac0](https://github.com/angular/angular.js/commit/426a5ac0547109648e5c5e358f668c274a111ab2),
68+
[#11508](https://github.com/angular/angular.js/issues/11508))
69+
- **ngAnimate:**
70+
- ensure that multiple requests to requestAnimationFrame are buffered
71+
([db20b830](https://github.com/angular/angular.js/commit/db20b830fc6074a00dc11d3f47d665c55e8bb515),
72+
[#11791](https://github.com/angular/angular.js/issues/11791))
73+
- ensure that an object is always returned even when no animation is set to run
74+
([d5683d21](https://github.com/angular/angular.js/commit/d5683d21165e725bc5a850e795f681b0a8a008f5))
75+
- force use of `ng-anchor` instead of a suffixed `-anchor` CSS class when triggering anchor animations
76+
([df24410c](https://github.com/angular/angular.js/commit/df24410c17d51a8d44929b9cffee2c91cedfed72))
77+
- rename `ng-animate-anchor` to `ng-anchor`
78+
([e6d053de](https://github.com/angular/angular.js/commit/e6d053de0993c0d38de46ad8a9c6760537316430))
79+
- ensure that shared CSS classes between anchor nodes are retained
80+
([e0014002](https://github.com/angular/angular.js/commit/e0014002370278778077d0612f9fab6beb80d07a),
81+
[#11681](https://github.com/angular/angular.js/issues/11681))
82+
- prohibit usage of the `ng-animate` class with classNameFilter
83+
([1002b80a](https://github.com/angular/angular.js/commit/1002b80a6fb5d98c424a01330234276d65d93c0b),
84+
[#11431](https://github.com/angular/angular.js/issues/11431), [#11807](https://github.com/angular/angular.js/issues/11807))
85+
- ensure that the temporary CSS classes are applied before detection
86+
([f7e9ff1a](https://github.com/angular/angular.js/commit/f7e9ff1aba9ed70835c084e6e154f6b0bf9c3a19),
87+
[#11769](https://github.com/angular/angular.js/issues/11769), [#11804](https://github.com/angular/angular.js/issues/11804))
88+
- ensure that all jqLite elements are deconstructed properly
89+
([64d05180](https://github.com/angular/angular.js/commit/64d05180a667e586328fbdbd328889d3b003571d),
90+
[#11658](https://github.com/angular/angular.js/issues/11658))
91+
- ensure animations are not attempted on text nodes
92+
([2aacc2d6](https://github.com/angular/angular.js/commit/2aacc2d622893e05eb94b3974d562e681cc3a17f),
93+
[#11703](https://github.com/angular/angular.js/issues/11703))
94+
- ensure JS animations recognize $animateCss directly
95+
([0681a540](https://github.com/angular/angular.js/commit/0681a5400e4150a961f9c8651e55623ca23b0cc2))
96+
- **ngClass:** add/remove classes which are properties of Object.prototype
97+
([f7b99970](https://github.com/angular/angular.js/commit/f7b999703f4f3bdaea035ce692f1a656b0c1a933),
98+
[#11813](https://github.com/angular/angular.js/issues/11813), [#11814](https://github.com/angular/angular.js/issues/11814))
99+
- **ngOptions:**
100+
- ensure that tracked properties are always watched
101+
([b5a9053b](https://github.com/angular/angular.js/commit/b5a9053ba33d48db2482ca6736d1fcae8b33d0f8),
102+
[#11784](https://github.com/angular/angular.js/issues/11784))
103+
- ensure label is watched in all cases
104+
([ae98dadf](https://github.com/angular/angular.js/commit/ae98dadf6dca3313746f42a441c7659654dd9d50),
105+
[#11765](https://github.com/angular/angular.js/issues/11765))
106+
- iterate over the options collection in the same way as `ngRepeat`
107+
([dfa722a8](https://github.com/angular/angular.js/commit/dfa722a8a6864793fd9580d8ae704a06d10b5509),
108+
[#11733](https://github.com/angular/angular.js/issues/11733))
109+
- use watchCollection not deep watch of ngModel
110+
([47f9fc3e](https://github.com/angular/angular.js/commit/47f9fc3e70bc361e8c11fe68dc3ec4489238efb3),
111+
[#11372](https://github.com/angular/angular.js/issues/11372), [#11653](https://github.com/angular/angular.js/issues/11653), [#11743](https://github.com/angular/angular.js/issues/11743))
112+
- **ngTouch:**
113+
- check undefined tagName for SVG event target
114+
([74eb17d7](https://github.com/angular/angular.js/commit/74eb17d7c8232f72f134bf2546f10fed7234d276))
115+
- don't prevent click event after a touchmove
116+
([95521876](https://github.com/angular/angular.js/commit/95521876eb9eb330548b0549f0cfe22a26d88f6e),
117+
[#10985](https://github.com/angular/angular.js/issues/10985))
118+
119+
120+
## Features
121+
122+
- **$resource:** include request context in error message
123+
([266bc652](https://github.com/angular/angular.js/commit/266bc6520ba4d188dbc949643def102604f98905),
124+
[#11363](https://github.com/angular/angular.js/issues/11363))
125+
126+
127+
## Breaking Changes
128+
129+
### ngAnimate
130+
131+
- **$animateCss:** due to [d5683d21](https://github.com/angular/angular.js/commit/d5683d21165e725bc5a850e795f681b0a8a008f5),
132+
The $animateCss service will now always return an
133+
object even if the animation is not set to run. If your code is using
134+
$animateCss then please consider the following code change:
135+
136+
```
137+
// before
138+
var animator = $animateCss(element, { ... });
139+
if (!animator) {
140+
continueApp();
141+
return;
142+
}
143+
var runner = animator.start();
144+
runner.done(continueApp);
145+
runner.then(continueApp);
146+
147+
// now
148+
var animator = $animateCss(element, { ... });
149+
var runner = animator.start();
150+
runner.done(continueApp);
151+
runner.then(continueApp);
152+
```
153+
154+
- due to [df24410c](https://github.com/angular/angular.js/commit/df24410c17d51a8d44929b9cffee2c91cedfed72),
155+
Prior to this fix there were to ways to apply CSS
156+
animation code to an anchor animation. With this fix, the suffixed
157+
CSS -anchor classes are now not used anymore for CSS anchor animations.
158+
159+
Instead just use the `ng-anchor` CSS class like so:
160+
161+
```html
162+
<div class="container-animation" ng-if="on">
163+
<div ng-animate-ref="1" class="my-anchor-element"></div>
164+
</div>
165+
166+
<div class="container-animation" ng-if="!on">
167+
<div ng-animate-ref="1" class="my-anchor-element"></div>
168+
</div>
169+
```
170+
171+
**before**:
172+
```css
173+
/* before (notice the container-animation CSS class) */
174+
.container-animation-anchor {
175+
transition:0.5s linear all;
176+
}
177+
```
178+
179+
**now**:
180+
```css
181+
/* now (just use `ng-anchor` on a class that both the
182+
elements that contain `ng-animate-ref` share) */
183+
.my-anchor-element.ng-anchor {
184+
transition:0.5s linear all;
185+
}
186+
```
187+
188+
- due to [e6d053de](https://github.com/angular/angular.js/commit/e6d053de0993c0d38de46ad8a9c6760537316430),
189+
if your CSS code made use of the `ng-animate-anchor`
190+
CSS class for referencing the anchored animation element then your
191+
code must now use `ng-anchor` instead.
192+
193+
- due to [1002b80a](https://github.com/angular/angular.js/commit/1002b80a6fb5d98c424a01330234276d65d93c0b),
194+
partially or fully using a regex value containing
195+
`ng-animate` as a token is not allowed anymore. Doing so will trigger a
196+
minErr exception to be thrown.
197+
198+
So don't do this:
199+
200+
```js
201+
// only animate elements that contain the `ng-animate` CSS class
202+
$animateProvider.classNameFilter(/ng-animate/);
203+
204+
// or partially contain it
205+
$animateProvider.classNameFilter(/some-class ng-animate another-class/);
206+
```
207+
208+
but this is OK:
209+
210+
```js
211+
$animateProvider.classNameFilter(/ng-animate-special/);
212+
```
213+
214+
215+
### ngOptions
216+
217+
- ** due to [dfa722a8](https://github.com/angular/angular.js/commit/dfa722a8a6864793fd9580d8ae704a06d10b5509),
218+
219+
220+
Although it is unlikely that anyone is using it in this way, this change does change the
221+
behaviour of `ngOptions` in the following case:
222+
223+
* you are iterating over an array-like object, using the array form of the `ngOptions` syntax
224+
(`item.label for item in items`) and that object contains non-numeric property keys.
225+
226+
In this case these properties with non-numeric keys will be ignored.
227+
228+
** Here array-like is defined by the result of a call to this internal function:
229+
https://github.com/angular/angular.js/blob/v1.4.0-rc.1/src/Angular.js#L198-L211 **
230+
231+
To get the desired behaviour you need to iterate using the object form of the `ngOptions` syntax
232+
(`value.label` for (key, value) in items)`).
233+
234+
235+
236+
1237
<a name="v1.4.0-rc.1"></a>
2238
# v1.4.0-rc.1 sartorial-chronography (2015-04-24)
3239

‎angularFiles.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ var angularFiles = {
8888
'angularModules': {
8989
'ngAnimate': [
9090
'src/ngAnimate/shared.js',
91+
'src/ngAnimate/rafScheduler.js',
9192
'src/ngAnimate/animateChildrenDirective.js',
9293
'src/ngAnimate/animateCss.js',
9394
'src/ngAnimate/animateCssDriver.js',

‎docs/content/error/$animate/nocb.ngdoc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
@ngdoc error
2+
@name $animate:nocb
3+
@fullName Do not pass a callback to animate methods
4+
@description
5+
6+
Since Angular 1.3, the methods of {@link ng.$animate} do not accept a callback as the last parameter.
7+
Instead, they return a promise to which you can attach `then` handlers to be run when the animation completes.
8+
9+
If you are getting this error then you need to update your code to use the promise-based API.
10+
11+
See https://github.com/angular/angular.js/commit/bf0f5502b1bbfddc5cdd2f138efd9188b8c652a9 for information about
12+
the change to the animation API and the changes you need to make.

0 commit comments

Comments
 (0)