58
58
* The animate-enter CSS class is the event name that you
59
59
* have provided within the ngAnimate attribute.
60
60
* */
61
- * .animate-enter-setup {
61
+ * .animate-enter {
62
62
* -webkit-transition: 1s linear all; /* Safari/Chrome */
63
63
* -moz-transition: 1s linear all; /* Firefox */
64
64
* -ms-transition: 1s linear all; /* IE10 */
74
74
* classes together to avoid any CSS-specificity
75
75
* conflicts
76
76
* */
77
- * .animate-enter-setup .animate-enter-start {
77
+ * .animate-enter.animate-enter-active {
78
78
* /* The animation code itself */
79
79
* opacity: 1;
80
80
* }
87
87
*
88
88
* <pre>
89
89
* <style type="text/css">
90
- * .animate-enter-setup {
90
+ * .animate-enter {
91
91
* -webkit-animation: enter_sequence 1s linear;
92
92
* -moz-animation: enter_sequence 1s linear;
93
93
* -o-animation: enter_sequence 1s linear;
116
116
*
117
117
* ngAnimate will first examine any CSS animation code and then fallback to using CSS transitions.
118
118
*
119
- * Upon DOM mutation, the setup class is added first, then the browser is allowed to reflow the content and then,
120
- * the start class is added to trigger the animation. The ngAnimate directive will automatically extract the duration
119
+ * Upon DOM mutation, the event class is added first, then the browser is allowed to reflow the content and then,
120
+ * the active class is added to trigger the animation. The ngAnimate directive will automatically extract the duration
121
121
* of the animation to determine when the animation ends. Once the animation is over then both CSS classes will be
122
122
* removed from the DOM. If a browser does not support CSS transitions or CSS animations then the animation will start and end
123
123
* immediately resulting in a DOM element that is at it's final state. This final state is when the DOM element
@@ -270,8 +270,7 @@ var $AnimatorProvider = function() {
270
270
beforeFn ( element , parent , after ) ;
271
271
afterFn ( element , parent , after ) ;
272
272
} else {
273
- var setupClass = className + '-setup' ;
274
- var startClass = className + '-start' ;
273
+ var activeClassName = className + '-active' ;
275
274
276
275
if ( ! parent ) {
277
276
parent = after ? after . parent ( ) : element . parent ( ) ;
@@ -284,7 +283,7 @@ var $AnimatorProvider = function() {
284
283
}
285
284
286
285
element . data ( NG_ANIMATE_CONTROLLER , { running :true } ) ;
287
- element . addClass ( setupClass ) ;
286
+ element . addClass ( className ) ;
288
287
beforeFn ( element , parent , after ) ;
289
288
if ( element . length == 0 ) return done ( ) ;
290
289
@@ -304,7 +303,7 @@ var $AnimatorProvider = function() {
304
303
} ;
305
304
306
305
function beginAnimation ( ) {
307
- element . addClass ( startClass ) ;
306
+ element . addClass ( activeClassName ) ;
308
307
if ( polyfillStart ) {
309
308
polyfillStart ( element , done , memento ) ;
310
309
} else if ( isFunction ( $window . getComputedStyle ) ) {
@@ -357,8 +356,8 @@ var $AnimatorProvider = function() {
357
356
358
357
function done ( ) {
359
358
afterFn ( element , parent , after ) ;
360
- element . removeClass ( setupClass ) ;
361
- element . removeClass ( startClass ) ;
359
+ element . removeClass ( className ) ;
360
+ element . removeClass ( activeClassName ) ;
362
361
element . removeData ( NG_ANIMATE_CONTROLLER ) ;
363
362
}
364
363
}
0 commit comments