Skip to content
This repository has been archived by the owner on May 29, 2019. It is now read-only.

Commit

Permalink
chore(carousel): combine animation check
Browse files Browse the repository at this point in the history
- Combine animation check since $animate.enabled value is set in the
  $watcher

Closes #4976
  • Loading branch information
wesleycho committed Nov 29, 2015
1 parent 19b7e3e commit d9e3dd5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/carousel/carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ angular.module('ui.bootstrap.carousel', [])

angular.extend(slide, {direction: direction, active: true});
angular.extend(self.currentSlide || {}, {direction: direction, active: false});
if ($animate.enabled() && !$scope.noTransition && !$scope.$currentTransition &&
if ($animate.enabled($element) && !$scope.$currentTransition &&
slide.$element && self.slides.length > 1) {
slide.$element.data(SLIDE_DIRECTION, slide.direction);
if (self.currentSlide && self.currentSlide.$element) {
Expand Down

0 comments on commit d9e3dd5

Please sign in to comment.