fix(Directive): Fixed fallback functionality

ml-archive · Jul 19, 2016 · 19a59db · 19a59db
1 parent feb1718
commit 19a59db
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 21 deletions.
diff --git a/dist/component.js b/dist/component.js
diff --git a/dist/component.js.map b/dist/component.js.map
diff --git a/dist/component.min.js b/dist/component.min.js
diff --git a/dist/component.min.js.map b/dist/component.min.js.map
diff --git a/src/nReplaceWithValidation.directive.ts b/src/nReplaceWithValidation.directive.ts
@@ -41,8 +41,9 @@ namespace nReplaceWithValidation {
         private messages: any;
         private input: any;
 
-        static $inject: Array<string> = ['$sce', 'nReplaceWithValidationConfig'];
-        constructor(private $sce: any,
+        static $inject: Array<string> = ['$scope', '$sce', 'nReplaceWithValidationConfig'];
+        constructor(private $scope: any,
+                    private $sce: any,
                     private nReplaceWithValidationConfig: INReplaceWithValidationProvider) {
 
             // Extend messages with config (defaults)
@@ -58,11 +59,19 @@ namespace nReplaceWithValidation {
                 this.messages[message] = this.$sce.trustAsHtml(this.messages[message]);
             }
 
-        }
-
-        private useFallback(): boolean {
-            if(this.input.$pristine && !this.input.$$parentForm.$submitted) return false;
-            return !this.messages[ Object.keys(this.input.$error)[0] ] && this.input.$invalid;
+            // Make sure all needed messages exists in this.messages otherwise create fallback
+            let self = this;
+            this.$scope.$watchCollection('nReplaceWithValidation.input.$validators', (newValue) => {
+                if(!newValue) return;
+
+                for(var validator in newValue) {
+
+                     if( !self.messages.hasOwnProperty(validator) ) {
+                         self.messages[validator] = self.messages.fallback;
+                     }
+
+                }
+            });
         }
     }
 

diff --git a/src/nReplaceWithValidation.html b/src/nReplaceWithValidation.html
@@ -10,11 +10,9 @@
           ng-show="!nReplaceWithValidation.input.$pristine || nReplaceWithValidation.input.$$parentForm.$submitted">
 
         <span class="is-invalid-label" ng-message-exp="key" ng-repeat="(key, message) in nReplaceWithValidation.messages track by $index">
-            {{message}}
+            <span ng-bind-html="message"></span>
         </span>
 
-
     </span>
-    <span ng-if="nReplaceWithValidation.useFallback()" class="is-invalid-label" ng-bind-html="nReplaceWithValidation.messages.fallback"></span>
 
 </div>