Finalised the controllerAs merge and added a test for the functionality.

dwmkerr · Jan 23, 2015 · 6cbddb6 · 6cbddb6
1 parent 4614975
commit 6cbddb6
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 19 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-modal-service",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "homepage": "https://github.com/dwmkerr/angular-modal-service",
   "authors": [
     "Dave Kerr (github.com/dwmkerr)"

diff --git a/dst/angular-modal-service.js b/dst/angular-modal-service.js
@@ -15,13 +15,13 @@
 
     //  Get the body of the document, we'll add the modal to this.
     var body = $document.find('body');
-    
+
     function ModalService() {
 
       var self = this;
 
       //  Returns a promise which gets the template, either
-      //  from the template parameter or via a request to the 
+      //  from the template parameter or via a request to the
       //  template url parameter.
       var getTemplate = function(template, templateUrl) {
         var deferred = $q.defer();
@@ -52,17 +52,23 @@
       };
 
       self.showModal = function(options) {
-        
+
         //  Create a deferred we'll resolve when the modal is ready.
         var deferred = $q.defer();
 
         //  Validate the input parameters.
-        var controller = options.controller;
-        if(!controller) {
+        var controllerName = options.controller;
+        if(!controllerName) {
           deferred.reject("No controller has been specified.");
           return deferred.promise;
         }
 
+        //  If a 'controllerAs' option has been provided, we change the controller
+        //  name to use 'as' syntax. $controller will automatically handle this.
+        if(options.controllerAs) {
+          controllerName = controllerName + " as " + options.controllerAs;
+        }
+
         //  Get the actual html of the template.
         getTemplate(options.template, options.templateUrl)
           .then(function(template) {
@@ -74,7 +80,7 @@
             //  the scope, as well as all inputs provided.
             //  We will also create a deferred that is resolved with a provided
             //  close function. The controller can then call 'close(result)'.
-            //  The controller can also provide a delay for closing - this is 
+            //  The controller can also provide a delay for closing - this is
             //  helpful if there are closing animations which must finish first.
             var closeDeferred = $q.defer();
             var inputs = {
@@ -104,7 +110,8 @@
             inputs.$element = modalElement;
 
             //  Create the controller, explicitly specifying the scope to use.
-            var modalController = $controller(controller, inputs);
+            var modalController = $controller(controllerName, inputs);
+
 
             //  Finally, append the modal to the dom.
             if (options.appendElement) {

diff --git a/dst/angular-modal-service.min.js b/dst/angular-modal-service.min.js
diff --git a/dst/angular-modal-service.min.js.map b/dst/angular-modal-service.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-modal-service",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "AngularJS Service for showing Modals and Popups",
   "main": "server.js",
   "scripts": {

diff --git a/src/angular-modal-service.js b/src/angular-modal-service.js
@@ -57,12 +57,18 @@
         var deferred = $q.defer();
 
         //  Validate the input parameters.
-        var controller = options.controller;
-        if(!controller) {
+        var controllerName = options.controller;
+        if(!controllerName) {
           deferred.reject("No controller has been specified.");
           return deferred.promise;
         }
 
+        //  If a 'controllerAs' option has been provided, we change the controller
+        //  name to use 'as' syntax. $controller will automatically handle this.
+        if(options.controllerAs) {
+          controllerName = controllerName + " as " + options.controllerAs;
+        }
+
         //  Get the actual html of the template.
         getTemplate(options.template, options.templateUrl)
           .then(function(template) {
@@ -104,12 +110,8 @@
             inputs.$element = modalElement;
 
             //  Create the controller, explicitly specifying the scope to use.
-            var modalController = $controller(controller, inputs);
+            var modalController = $controller(controllerName, inputs);
 
-            if(options.controllerAs) {
-
-              inputs.$scope[options.controllerAs] = modalController;
-            }
 
             //  Finally, append the modal to the dom.
             if (options.appendElement) {

diff --git a/test/controller.spec.js b/test/controller.spec.js
@@ -12,6 +12,9 @@ describe('controller', function() {
       $scope.input1 = input1;
       $scope.input2 = input2;
       $scope.close = close;
+    })
+    .controller('ControllerAsController', function() {
+      this.character = "Fry";
     });
 
   beforeEach(function() {
@@ -71,4 +74,27 @@ describe('controller', function() {
 
   });
 
+  it('should add a controller to the scope if controllerAs is used', function() {
+
+    $httpBackend.expectGET('some/controllertemplate.html');
+
+    ModalService.showModal({
+      controller: 'ControllerAsController',
+      controllerAs: 'futurama',
+      templateUrl: 'some/controllertemplate.html'
+    }).then(function(modal) {
+
+      //  The controller should be on the scope.
+      expect(modal.scope.futurama).not.toBeNull();
+
+      //  Fields defined on the controller instance should be on the 
+      //  controller on the scope.
+      expect(modal.scope.futurama.character).toBe('Fry');
+
+    });
+
+    $httpBackend.flush();
+
+  });
+
 });