Merge pull request #176 from tamakisquare/modal-controlleras-option

feat(modal): Add support for 'controllerAs' option

Author: jbrowning

src/modal/docs/readme.md

@@ -7,6 +7,7 @@ The `$modal` service has only one method: `open(options)` where available option
 * `template` - inline template representing the modal's content
 * `scope` - a scope instance to be used for the modal's content (actually the `$modal` service is going to create a child scope of a provided scope). Defaults to `$rootScope`
 * `controller` - a controller for a modal instance - it can initialize scope used by modal. Accepts the "controller-as" syntax, and can be injected with `$modalInstance`
+* `controllerAs` - an alternative to the aforementioned "controller-as" syntax. This is intended for the case of when the `controller` option is assigned an anonymous or local function and thus the "controller-as" syntax couldn't be applied.
 * `resolve` - members that will be resolved and passed to the controller as locals; it is equivalent of the `resolve` property for AngularJS routes
 * `backdrop` - controls presence of a backdrop. Allowed values: true (default), false (no backdrop), `'static'` - backdrop is present but modal window is not closed when clicking outside of the modal window.
 * `keyboard` - indicates whether the dialog should be closable by hitting the ESC key, defaults to true

src/modal/modal.js

@@ -362,6 +362,9 @@ angular.module('mm.foundation.modal', ['mm.foundation.transition'])
                 });
 
                 ctrlInstance = $controller(modalOptions.controller, ctrlLocals);
+                if (modalOptions.controllerAs) {
+                  modalScope[modalOptions.controllerAs] = ctrlInstance;
+                }
               }
 
               $modalStack.open(modalInstance, {

src/modal/test/modal.spec.js

@@ -321,7 +321,7 @@ describe('$modal', function () {
         expect($document).toHaveModalOpenWithContent('Content from ctrl true', 'div');
       });
 
-      it('should accept controllerAs alias', function () {
+      it('should accept controller-as syntax in `controller` option', function () {
         $controllerProvider.register('TestCtrl', function($modalInstance) {
           this.fromCtrl = 'Content from ctrl';
           this.isModalInstance = angular.isObject($modalInstance) && angular.isFunction($modalInstance.close);
@@ -331,6 +331,18 @@ describe('$modal', function () {
         expect($document).toHaveModalOpenWithContent('Content from ctrl true', 'div');
       });
 
+      it('should accept `controllerAs` option', function () {
+        var modal = open({
+          template: '<div>{{test.fromCtrl}} {{test.isModalInstance}}</div>',
+          controller: function($modalInstance) {
+            this.fromCtrl = 'Content from ctrl';
+            this.isModalInstance = angular.isObject($modalInstance) && angular.isFunction($modalInstance.close);
+          },
+          controllerAs: 'test'
+        });
+        expect($document).toHaveModalOpenWithContent('Content from ctrl true', 'div');
+      });
+
     });
 
     describe('resolve', function () {