fix(accordion): re-expose AccordionController

- Expose `AccordionController` with deprecation message Closes #4524
angular-ui · Oct 3, 2015 · 5382226 · 5382226
1 parent db36c62
commit 5382226
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/accordion/accordion.js b/src/accordion/accordion.js
@@ -135,10 +135,21 @@ angular.module('ui.bootstrap.accordion')
 
   .value('$accordionSuppressWarning', false)
 
+  .controller('AccordionController', ['$scope', '$attrs', '$controller', '$log', '$accordionSuppressWarning', function($scope, $attrs, $controller, $log, $accordionSuppressWarning) {
+    if (!$accordionSuppressWarning) {
+      $log.warn('AccordionController is now deprecated. Use UibAccordionController instead.');
+    }
+
+    angular.extend(this, $controller('UibAccordionController', {
+      $scope: $scope,
+      $attrs: $attrs
+    }));
+  }])
+
   .directive('accordion', ['$log', '$accordionSuppressWarning', function($log, $accordionSuppressWarning) {
     return {
       restrict: 'EA',
-      controller: 'UibAccordionController',
+      controller: 'AccordionController',
       controllerAs: 'accordion',
       transclude: true,
       replace: false,

diff --git a/src/accordion/test/accordion.spec.js b/src/accordion/test/accordion.spec.js
@@ -12,7 +12,6 @@ describe('uib-accordion', function() {
   }));
 
   describe('controller', function () {
-
     var ctrl, $element, $attrs;
     beforeEach(inject(function($controller) {
       $attrs = {};
@@ -627,9 +626,10 @@ describe('accordion deprecation', function() {
     element = $compile(element)($rootScope);
     $rootScope.$digest();
 
-    expect($log.warn.calls.count()).toBe(3);
-    expect($log.warn.calls.argsFor(0)).toEqual(['accordion-heading is now deprecated. Use uib-accordion-heading instead.']);
-    expect($log.warn.calls.argsFor(1)).toEqual(['accordion-group is now deprecated. Use uib-accordion-group instead.']);
-    expect($log.warn.calls.argsFor(2)).toEqual(['accordion is now deprecated. Use uib-accordion instead.']);
+    expect($log.warn.calls.count()).toBe(4);
+    expect($log.warn.calls.argsFor(0)).toEqual(['AccordionController is now deprecated. Use UibAccordionController instead.']);
+    expect($log.warn.calls.argsFor(1)).toEqual(['accordion-heading is now deprecated. Use uib-accordion-heading instead.']);
+    expect($log.warn.calls.argsFor(2)).toEqual(['accordion-group is now deprecated. Use uib-accordion-group instead.']);
+    expect($log.warn.calls.argsFor(3)).toEqual(['accordion is now deprecated. Use uib-accordion instead.']);
   }));
 });