@@ -3,7 +3,6 @@ angular.module('ui.bootstrap.carousel', [])
3
3
. controller ( 'UibCarouselController' , [ '$scope' , '$element' , '$interval' , '$animate' , function ( $scope , $element , $interval , $animate ) {
4
4
var self = this ,
5
5
slides = self . slides = $scope . slides = [ ] ,
6
- NEW_ANIMATE = angular . version . minor >= 4 ,
7
6
SLIDE_DIRECTION = 'uib-slideDirection' ,
8
7
currentIndex = - 1 ,
9
8
currentInterval , isPlaying ;
@@ -37,18 +36,12 @@ angular.module('ui.bootstrap.carousel', [])
37
36
}
38
37
39
38
$scope . $currentTransition = true ;
40
- if ( NEW_ANIMATE ) {
41
- $animate . on ( 'addClass' , slide . $element , function ( element , phase ) {
42
- if ( phase === 'close' ) {
43
- $scope . $currentTransition = null ;
44
- $animate . off ( 'addClass' , element ) ;
45
- }
46
- } ) ;
47
- } else {
48
- slide . $element . one ( '$animate:close' , function closeFn ( ) {
39
+ $animate . on ( 'addClass' , slide . $element , function ( element , phase ) {
40
+ if ( phase === 'close' ) {
49
41
$scope . $currentTransition = null ;
50
- } ) ;
51
- }
42
+ $animate . off ( 'addClass' , element ) ;
43
+ }
44
+ } ) ;
52
45
}
53
46
54
47
self . currentSlide = slide ;
@@ -250,14 +243,9 @@ angular.module('ui.bootstrap.carousel', [])
250
243
} )
251
244
252
245
. animation ( '.item' , [
253
- '$injector' , '$animate' ,
254
- function ( $injector , $animate ) {
255
- var SLIDE_DIRECTION = 'uib-slideDirection' ,
256
- $animateCss = null ;
257
-
258
- if ( $injector . has ( '$animateCss' ) ) {
259
- $animateCss = $injector . get ( '$animateCss' ) ;
260
- }
246
+ '$animate' , '$animateCss' ,
247
+ function ( $animate , $animateCss ) {
248
+ var SLIDE_DIRECTION = 'uib-slideDirection' ;
261
249
262
250
function removeClass ( element , className , callback ) {
263
251
element . removeClass ( className ) ;
@@ -277,20 +265,11 @@ function ($injector, $animate) {
277
265
directionClass + ' ' + direction , done ) ;
278
266
element . addClass ( direction ) ;
279
267
280
- if ( $animateCss ) {
281
- $animateCss ( element , { addClass : directionClass } )
282
- . start ( )
283
- . done ( removeClassFn ) ;
284
- } else {
285
- $animate . addClass ( element , directionClass ) . then ( function ( ) {
286
- if ( ! stopped ) {
287
- removeClassFn ( ) ;
288
- }
289
- done ( ) ;
290
- } ) ;
291
- }
268
+ $animateCss ( element , { addClass : directionClass } )
269
+ . start ( )
270
+ . done ( removeClassFn ) ;
292
271
293
- return function ( ) {
272
+ return function ( ) {
294
273
stopped = true ;
295
274
} ;
296
275
}
@@ -304,18 +283,10 @@ function ($injector, $animate) {
304
283
var directionClass = direction == 'next' ? 'left' : 'right' ;
305
284
var removeClassFn = removeClass . bind ( this , element , directionClass , done ) ;
306
285
307
- if ( $animateCss ) {
308
- $animateCss ( element , { addClass : directionClass } )
309
- . start ( )
310
- . done ( removeClassFn ) ;
311
- } else {
312
- $animate . addClass ( element , directionClass ) . then ( function ( ) {
313
- if ( ! stopped ) {
314
- removeClassFn ( ) ;
315
- }
316
- done ( ) ;
317
- } ) ;
318
- }
286
+ $animateCss ( element , { addClass : directionClass } )
287
+ . start ( )
288
+ . done ( removeClassFn ) ;
289
+
319
290
return function ( ) {
320
291
stopped = true ;
321
292
} ;
0 commit comments