Reverted custom scope functionality and re-order or link/controller s…

…tep.

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.6.5
+
+* Reverted changes below as they led to a bug with injected `$element` in modal controller.
+  Added a test to protect against this case in the future.
+
 ## v0.6.4
 
 * Merged `scope` option field. Updated readme.

README.md

@@ -122,7 +122,6 @@ The `showModal` function takes an object with these fields:
 * `inputs`: A set of values to pass as inputs to the controller. Each value provided
   is injected into the controller constructor.
 * `appendElement`: The custom angular element to append the modal to instead of default `body` element.
-* `scope`: Optional. If provided, a new scope will not be created for the model - this scope will be used. Be aware that the modal service will *still* destroy the scope when the modal is closed. Typically you should not need to use this field, as the generated scope will handle most use cases.
 
 #### The Modal Object
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-modal-service",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "homepage": "https://github.com/dwmkerr/angular-modal-service",
   "authors": [
     "Dave Kerr (github.com/dwmkerr)"

dst/angular-modal-service.js

@@ -74,7 +74,7 @@
           .then(function(template) {
 
             //  Create a new scope for the modal.
-            var modalScope = options.scope || $rootScope.$new();
+            var modalScope = $rootScope.$new();
 
             //  Create the inputs object to the controller - this will include
             //  the scope, as well as all inputs provided.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-modal-service",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "AngularJS Service for showing Modals and Popups",
   "main": "./dst/angular-modal-service.js",
   "scripts": {

test/controller.spec.js

@@ -15,6 +15,9 @@ describe('controller', function() {
     })
     .controller('ControllerAsController', function() {
       this.character = "Fry";
+    })
+    .controller('ElementController', function($scope, $element) {
+      $scope.getElement = function() { return $element; };
     });
 
   beforeEach(function() {
@@ -97,4 +100,22 @@ describe('controller', function() {
 
   });
 
+  it('should inject the modal element into the controller', function() {
+
+    $httpBackend.expectGET('some/controllertemplate.html');
+
+    ModalService.showModal({
+      controller: 'ElementController',
+      templateUrl: 'some/controllertemplate.html'
+    }).then(function(modal) {
+
+      //  The controller should be on the scope.
+      expect(modal.scope.getElement()).not.toBeUndefined();
+
+    });
+
+    $httpBackend.flush();
+
+  });
+
 });