Merge pull request #2 from jlemaes/master

always instantiate controller

Author: skeymeulen

bower.json

@@ -4,7 +4,7 @@
     "Sander Keymeulen <[email protected]>"
   ],
   "description": "An AngularJS wrapper for Sweet Alert 2",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "main": "swangular.js",
   "moduleType": [],
   "keywords": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "swangular",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "An AngularJS wrapper for Sweet Alert 2",
   "main": "swangular.js",
   "scripts": {

swangular.js

@@ -120,11 +120,13 @@ angular.module('swangular', [])
                       locals,
                       {
                           $scope: scope
-                      }), true, controllerAs);
+                      }), false, controllerAs);
 
-                      if(typeof preConfirm === 'string'){
-                          options.preConfirm = controllerInstance()[preConfirm];
-                      }
+                  if (typeof preConfirm === 'string'){
+                      options.preConfirm = controllerInstance[preConfirm];
+                  } else if (typeof preConfirm === 'function'){
+                      options.preConfirm = preConfirm;
+                  }
                 }
                 var prom = swal(options);
                 var html = document.getElementsByClassName('swal2-modal')[0];
@@ -137,20 +139,6 @@ angular.module('swangular', [])
 
         }
 
-        function _wrapHtmlInController(options, html){
-
-            var controllerString = 'ng-controller="' + options.controller;
-
-            if(options.controllerAs){
-
-                controllerString = controllerString.concat(' as ' + options.controllerAs);
-
-            }
-
-            return '<div ' + controllerString + '">' + html + '</div>';
-
-        }
-
         function _getHtml(options){
 
             if(options.htmlTemplate) {