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

Commit 5382226

Browse files
committed
fix(accordion): re-expose AccordionController
- Expose `AccordionController` with deprecation message Closes #4524
1 parent db36c62 commit 5382226

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

src/accordion/accordion.js

+12-1
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,21 @@ angular.module('ui.bootstrap.accordion')
135135

136136
.value('$accordionSuppressWarning', false)
137137

138+
.controller('AccordionController', ['$scope', '$attrs', '$controller', '$log', '$accordionSuppressWarning', function($scope, $attrs, $controller, $log, $accordionSuppressWarning) {
139+
if (!$accordionSuppressWarning) {
140+
$log.warn('AccordionController is now deprecated. Use UibAccordionController instead.');
141+
}
142+
143+
angular.extend(this, $controller('UibAccordionController', {
144+
$scope: $scope,
145+
$attrs: $attrs
146+
}));
147+
}])
148+
138149
.directive('accordion', ['$log', '$accordionSuppressWarning', function($log, $accordionSuppressWarning) {
139150
return {
140151
restrict: 'EA',
141-
controller: 'UibAccordionController',
152+
controller: 'AccordionController',
142153
controllerAs: 'accordion',
143154
transclude: true,
144155
replace: false,

src/accordion/test/accordion.spec.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ describe('uib-accordion', function() {
1212
}));
1313

1414
describe('controller', function () {
15-
1615
var ctrl, $element, $attrs;
1716
beforeEach(inject(function($controller) {
1817
$attrs = {};
@@ -627,9 +626,10 @@ describe('accordion deprecation', function() {
627626
element = $compile(element)($rootScope);
628627
$rootScope.$digest();
629628

630-
expect($log.warn.calls.count()).toBe(3);
631-
expect($log.warn.calls.argsFor(0)).toEqual(['accordion-heading is now deprecated. Use uib-accordion-heading instead.']);
632-
expect($log.warn.calls.argsFor(1)).toEqual(['accordion-group is now deprecated. Use uib-accordion-group instead.']);
633-
expect($log.warn.calls.argsFor(2)).toEqual(['accordion is now deprecated. Use uib-accordion instead.']);
629+
expect($log.warn.calls.count()).toBe(4);
630+
expect($log.warn.calls.argsFor(0)).toEqual(['AccordionController is now deprecated. Use UibAccordionController instead.']);
631+
expect($log.warn.calls.argsFor(1)).toEqual(['accordion-heading is now deprecated. Use uib-accordion-heading instead.']);
632+
expect($log.warn.calls.argsFor(2)).toEqual(['accordion-group is now deprecated. Use uib-accordion-group instead.']);
633+
expect($log.warn.calls.argsFor(3)).toEqual(['accordion is now deprecated. Use uib-accordion instead.']);
634634
}));
635635
});

0 commit comments

Comments
 (0)