diff --git a/src/carousel/carousel.js b/src/carousel/carousel.js index a3cb2aac7d..91a970db1b 100644 --- a/src/carousel/carousel.js +++ b/src/carousel/carousel.js @@ -420,77 +420,3 @@ function ($injector, $animate) { } }; }]); - -/* deprecated carousel below */ - -angular.module('ui.bootstrap.carousel') - -.value('$carouselSuppressWarning', false) - -.controller('CarouselController', ['$scope', '$element', '$controller', '$log', '$carouselSuppressWarning', function($scope, $element, $controller, $log, $carouselSuppressWarning) { - if (!$carouselSuppressWarning) { - $log.warn('CarouselController is now deprecated. Use UibCarouselController instead.'); - } - - angular.extend(this, $controller('UibCarouselController', { - $scope: $scope, - $element: $element - })); -}]) - -.directive('carousel', ['$log', '$carouselSuppressWarning', function($log, $carouselSuppressWarning) { - return { - transclude: true, - replace: true, - controller: 'CarouselController', - controllerAs: 'carousel', - require: 'carousel', - templateUrl: function(element, attrs) { - return attrs.templateUrl || 'template/carousel/carousel.html'; - }, - scope: { - interval: '=', - noTransition: '=', - noPause: '=', - noWrap: '&' - }, - link: function() { - if (!$carouselSuppressWarning) { - $log.warn('carousel is now deprecated. Use uib-carousel instead.'); - } - } - }; -}]) - -.directive('slide', ['$log', '$carouselSuppressWarning', function($log, $carouselSuppressWarning) { - return { - require: '^carousel', - transclude: true, - replace: true, - templateUrl: function(element, attrs) { - return attrs.templateUrl || 'template/carousel/slide.html'; - }, - scope: { - active: '=?', - actual: '=?', - index: '=?' - }, - link: function (scope, element, attrs, carouselCtrl) { - if (!$carouselSuppressWarning) { - $log.warn('slide is now deprecated. Use uib-slide instead.'); - } - - carouselCtrl.addSlide(scope, element); - //when the scope is destroyed then remove the slide from the current slides array - scope.$on('$destroy', function() { - carouselCtrl.removeSlide(scope); - }); - - scope.$watch('active', function(active) { - if (active) { - carouselCtrl.select(scope); - } - }); - } - }; -}]); diff --git a/src/carousel/test/carousel.spec.js b/src/carousel/test/carousel.spec.js index adb9c76ecc..df0b15ee84 100644 --- a/src/carousel/test/carousel.spec.js +++ b/src/carousel/test/carousel.spec.js @@ -68,7 +68,7 @@ describe('carousel', function() { elm = $compile( '' + - '' + + '' + '' )(scope); $rootScope.$digest(); @@ -537,58 +537,3 @@ describe('carousel', function() { }), scope.slides)).toBe(true); }); }); - -describe('carousel deprecation', function() { - beforeEach(module('ui.bootstrap.carousel')); - beforeEach(module('template/carousel/carousel.html', 'template/carousel/slide.html')); - - it('should suppress warning', function() { - module(function($provide) { - $provide.value('$carouselSuppressWarning', true); - }); - - inject(function($compile, $log, $rootScope) { - spyOn($log, 'warn'); - - var element = '' + - '' + - '{{slide.content}}' + - '' + - ''; - element = $compile(element)($rootScope); - $rootScope.$digest(); - expect($log.warn.calls.count()).toBe(0); - }); - }); - - it('should give warning by default', inject(function($compile, $log, $rootScope) { - spyOn($log, 'warn'); - - var element = '' + - '' + - '{{slide.content}}' + - '' + - ''; - element = $compile(element)($rootScope); - $rootScope.$digest(); - - expect($log.warn.calls.count()).toBe(2); - expect($log.warn.calls.argsFor(0)).toEqual(['CarouselController is now deprecated. Use UibCarouselController instead.']); - expect($log.warn.calls.argsFor(1)).toEqual(['carousel is now deprecated. Use uib-carousel instead.']); - })); - - it('should give warning by default for slider', inject(function($compile, $log, $rootScope) { - spyOn($log, 'warn'); - - var element = '' + - '' + - ''; - element = $compile(element)($rootScope); - $rootScope.$digest(); - - expect($log.warn.calls.count()).toBe(3); - expect($log.warn.calls.argsFor(0)).toEqual(['CarouselController is now deprecated. Use UibCarouselController instead.']); - expect($log.warn.calls.argsFor(1)).toEqual(['slide is now deprecated. Use uib-slide instead.']); - expect($log.warn.calls.argsFor(2)).toEqual(['carousel is now deprecated. Use uib-carousel instead.']); - })); -});