diff --git a/src/carousel/carousel.css b/src/carousel/carousel.css index a17a03ac68..d2ec653dc1 100644 --- a/src/carousel/carousel.css +++ b/src/carousel/carousel.css @@ -1,4 +1,4 @@ .ng-animate.item:not(.left):not(.right) { -webkit-transition: 0s ease-in-out left; transition: 0s ease-in-out left -}t +} diff --git a/src/modal/modal.js b/src/modal/modal.js index 7e672ad3da..1612998625 100644 --- a/src/modal/modal.js +++ b/src/modal/modal.js @@ -59,6 +59,7 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.multiMap', 'ui.bootstrap.sta }; function linkFn(scope, element, attrs) { + // Deferred object that will be resolved when this modal is rendered. var modalRenderDeferObj = $q.defer(); // Resolve render promise post-digest @@ -67,21 +68,23 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.multiMap', 'ui.bootstrap.sta }); modalRenderDeferObj.promise.then(function() { - if (attrs.modalInClass) { $animate.addClass(element, attrs.modalInClass); - - scope.$on($modalStack.NOW_CLOSING_EVENT, function(e, setIsAsync) { - var done = setIsAsync(); - if (scope.modalOptions.animation) { - $animate.removeClass(element, attrs.modalInClass).then(done); - } else { - done(); - } - }); } }); + if (attrs.modalInClass) { + scope.$on($modalStack.NOW_CLOSING_EVENT, function(e, setIsAsync) { + var done = setIsAsync(); + if (scope.modalOptions.animation) { + $animate.removeClass(element, attrs.modalInClass).then(done); + } else { + done(); + } + }); + } + + } }])