Merge branch 'master' of https://github.com/wbreza/angular-dynamic-forms

Author: wbreza

dist/dynamic-forms.js

@@ -108,22 +108,22 @@
 
         vm.showError = function () {
             var field = $scope.formField;
-            return field && field.$invalid && field.$dirty;
+            return !!(field && field.$invalid && field.$dirty);
         };
 
         vm.showSuccess = function () {
             var field = $scope.formField;
-            return field && field.$valid && field.$dirty;
+            return !!(field && field.$valid && field.$dirty);
         };
 
         vm.hasError = function() {
             var field = $scope.formField;
-            return field.errorMessage && field.$dirty;
+            return !!($scope.errorMessage && field.$dirty);
         };
 
         vm.hasSuccess = function() {
             var field = $scope.formField;
-            return field.$valid && ($scope.model || field.$dirty);
+            return !!(field.$valid && ($scope.model || field.$dirty));
         };
     }
 
@@ -688,12 +688,14 @@
 
             scope.$watch(function () {
                 if (!formField.$invalid) {
+                    scope.errorKey = null;
                     scope.errorMessage = null;
                     return;
                 }
 
                 for (var key in formField.$error) {
                     if (formField.$error[key] === true) {
+                        scope.errorKey = key;
                         scope.errorMessage = getErrorMessage(fieldSchema, key);
                         break;
                     }

dist/dynamic-forms.min.js

@@ -6,22 +6,22 @@
 
         vm.showError = function () {
             var field = $scope.formField;
-            return field && field.$invalid && field.$dirty;
+            return !!(field && field.$invalid && field.$dirty);
         };
 
         vm.showSuccess = function () {
             var field = $scope.formField;
-            return field && field.$valid && field.$dirty;
+            return !!(field && field.$valid && field.$dirty);
         };
 
         vm.hasError = function() {
             var field = $scope.formField;
-            return field.errorMessage && field.$dirty;
+            return !!($scope.errorMessage && field.$dirty);
         };
 
         vm.hasSuccess = function() {
             var field = $scope.formField;
-            return field.$valid && ($scope.model || field.$dirty);
+            return !!(field.$valid && ($scope.model || field.$dirty));
         };
     }
 

src/directives/dynamicFieldDirective.js

@@ -70,12 +70,14 @@
 
             scope.$watch(function () {
                 if (!formField.$invalid) {
+                    scope.errorKey = null;
                     scope.errorMessage = null;
                     return;
                 }
 
                 for (var key in formField.$error) {
                     if (formField.$error[key] === true) {
+                        scope.errorKey = key;
                         scope.errorMessage = getErrorMessage(fieldSchema, key);
                         break;
                     }