@@ -140,36 +140,44 @@ if (angular.version.minor >= 4) {
140
140
. factory ( '$$forceReflow' , $$ForceReflowFactory )
141
141
. factory ( '$$AnimateRunner' , $$AnimateRunnerFactory )
142
142
. factory ( '$$rAFMutex' , $$rAFMutexFactory )
143
- . factory ( '$animateCss' , [ '$window' , '$$rAF' , '$$AnimateRunner' , '$$forceReflow' , '$$jqLite' , '$timeout' ,
144
- function ( $window , $$rAF , $$AnimateRunner , $$forceReflow , $$jqLite , $timeout ) {
143
+ . factory ( '$animateCss' , [ '$window' , '$$rAF' , '$$AnimateRunner' , '$$forceReflow' , '$$jqLite' , '$timeout' , '$animate' ,
144
+ function ( $window , $$rAF , $$AnimateRunner , $$forceReflow , $$jqLite , $timeout , $animate ) {
145
145
146
146
function init ( element , options ) {
147
147
148
148
var temporaryStyles = [ ] ;
149
149
var node = getDomNode ( element ) ;
150
+ var areAnimationsAllowed = node && $animate . enabled ( ) ;
150
151
151
- if ( options . transitionStyle ) {
152
- temporaryStyles . push ( [ PREFIX + 'transition' , options . transitionStyle ] ) ;
153
- }
152
+ var hasCompleteStyles = false ;
153
+ var hasCompleteClasses = false ;
154
154
155
- if ( options . keyframeStyle ) {
156
- temporaryStyles . push ( [ PREFIX + 'animation' , options . keyframeStyle ] ) ;
157
- }
155
+ if ( areAnimationsAllowed ) {
156
+ if ( options . transitionStyle ) {
157
+ temporaryStyles . push ( [ PREFIX + 'transition' , options . transitionStyle ] ) ;
158
+ }
158
159
159
- if ( options . delay ) {
160
- temporaryStyles . push ( [ PREFIX + 'transition-delay' , options . delay + 's' ] ) ;
161
- }
160
+ if ( options . keyframeStyle ) {
161
+ temporaryStyles . push ( [ PREFIX + 'animation' , options . keyframeStyle ] ) ;
162
+ }
163
+
164
+ if ( options . delay ) {
165
+ temporaryStyles . push ( [ PREFIX + 'transition-delay' , options . delay + 's' ] ) ;
166
+ }
167
+
168
+ if ( options . duration ) {
169
+ temporaryStyles . push ( [ PREFIX + 'transition-duration' , options . duration + 's' ] ) ;
170
+ }
171
+
172
+ hasCompleteStyles = options . keyframeStyle ||
173
+ ( options . to && ( options . duration > 0 || options . transitionStyle ) ) ;
174
+ hasCompleteClasses = ! ! options . addClass || ! ! options . removeClass ;
162
175
163
- if ( options . duration ) {
164
- temporaryStyles . push ( [ PREFIX + 'transition-duration' , options . duration + 's' ] ) ;
176
+ blockTransition ( element , true ) ;
165
177
}
166
178
167
- var hasCompleteStyles = options . keyframeStyle ||
168
- ( options . to && ( options . duration > 0 || options . transitionStyle ) ) ;
169
- var hasCompleteClasses = ! ! options . addClass || ! ! options . removeClass ;
170
- var hasCompleteAnimation = hasCompleteStyles || hasCompleteClasses ;
179
+ var hasCompleteAnimation = areAnimationsAllowed && ( hasCompleteStyles || hasCompleteClasses ) ;
171
180
172
- blockTransition ( element , true ) ;
173
181
applyAnimationFromStyles ( element , options ) ;
174
182
175
183
var animationClosed = false ;
0 commit comments