Fix issue where empty Form Controller was throwing an error

ghiscoding · Jan 24, 2017 · 96bc98f · 96bc98f
1 parent 6d99a53
commit 96bc98f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-validation-ghiscoding",
-  "version": "1.5.15",
+  "version": "1.5.16",
   "author": "Ghislain B.",
   "description": "Angular-Validation Directive and Service (ghiscoding)",
   "main": [

diff --git a/dist/angular-validation.min.js b/dist/angular-validation.min.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -102,7 +102,7 @@ gulp.task('compress', ['clean'], function() {
     .pipe(gulp.dest('dist'));
 });
 
-gulp.task('test', function() {
+gulp.task('e2e', function() {
   gulp.src(["./protractor/*_spec.js"])
       .pipe(protractor({
           configFile: "protractor/conf.js",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-validation-ghiscoding",
-  "version": "1.5.15",
+  "version": "1.5.16",
   "author": "Ghislain B.",
   "description": "Angular-Validation Directive and Service (ghiscoding)",
   "main": "dist/angular-validation.min",

diff --git a/readme.md b/readme.md
@@ -1,5 +1,5 @@
 #Angular Validation (Directive / Service)
-`Version: 1.5.15`
+`Version: 1.5.16`
 ### Forms Validation with Angular made easy!
 ##### (Concept comes from the amazing Laravel)
 

diff --git a/src/validation-common.js b/src/validation-common.js
@@ -153,7 +153,10 @@ angular
         // also save it inside controllerAs form (if found)
         if (!!form && !!form.$name) {
           var formName = form.$name.indexOf('.') >= 0 ? form.$name.split('.')[1] : form.$name;
-          var ctrlForm = (!!_globalOptions.controllerAs[formName]) ? _globalOptions.controllerAs[formName] : self.elm.controller()[formName];
+          var ctrlForm = (!!_globalOptions.controllerAs && !!_globalOptions.controllerAs[formName]) 
+			? _globalOptions.controllerAs[formName] 
+			: ((typeof self.elm.controller() !== "undefined") ? self.elm.controller()[formName] : null);
+
           if(!!ctrlForm) {
             ctrlForm.$validationSummary = arrayFindObjects(_validationSummary, 'formName', form.$name);
           }