@@ -161,10 +161,14 @@ angular.module('mgcrea.ngStrap.modal', ['mgcrea.ngStrap.helpers.dimensions'])
161
161
if ( options . backdrop ) {
162
162
$animate . enter ( backdropElement , bodyElement , null ) ;
163
163
}
164
- // Support v1.3+ $animate
165
- // https://github.com/angular/angular.js/commit/bf0f5502b1bbfddc5cdd2f138efd9188b8c652a9
166
- var promise = $animate . enter ( modalElement , parent , after , enterAnimateCallback ) ;
167
- if ( promise && promise . then ) promise . then ( enterAnimateCallback ) ;
164
+
165
+ // Support v1.2+ $animate
166
+ // https://github.com/angular/angular.js/issues/11713
167
+ if ( angular . version . minor <= 2 ) {
168
+ $animate . enter ( modalElement , parent , after , enterAnimateCallback ) ;
169
+ } else {
170
+ $animate . enter ( modalElement , parent , after ) . then ( enterAnimateCallback ) ;
171
+ }
168
172
169
173
$modal . $isShown = scope . $isShown = true ;
170
174
safeDigest ( scope ) ;
@@ -201,10 +205,14 @@ angular.module('mgcrea.ngStrap.modal', ['mgcrea.ngStrap.helpers.dimensions'])
201
205
if ( scope . $emit ( options . prefixEvent + '.hide.before' , $modal ) . defaultPrevented ) {
202
206
return ;
203
207
}
204
- var promise = $animate . leave ( modalElement , leaveAnimateCallback ) ;
205
- // Support v1.3+ $animate
206
- // https://github.com/angular/angular.js/commit/bf0f5502b1bbfddc5cdd2f138efd9188b8c652a9
207
- if ( promise && promise . then ) promise . then ( leaveAnimateCallback ) ;
208
+
209
+ // Support v1.2+ $animate
210
+ // https://github.com/angular/angular.js/issues/11713
211
+ if ( angular . version . minor <= 2 ) {
212
+ $animate . leave ( modalElement , leaveAnimateCallback ) ;
213
+ } else {
214
+ $animate . leave ( modalElement ) . then ( leaveAnimateCallback ) ;
215
+ }
208
216
209
217
if ( options . backdrop ) {
210
218
$animate . leave ( backdropElement ) ;
0 commit comments