bug fix: "I want to decide it is own when and what I will to validate!"

valor-software#914
optimistex · Dec 15, 2017 · b799bf0 · b799bf0
1 parent 516ce63
commit b799bf0
Show file tree

Hide file tree

Showing 2 changed files with 298 additions and 231 deletions.
diff --git a/src/select/select.ts b/src/select/select.ts
@@ -121,7 +121,7 @@ let styles = `
         {
             provide: NG_VALIDATORS,
             useExisting: forwardRef(() => SelectComponent),
-            multi: true,
+            multi: true
         }
     ],
     template: `
@@ -529,12 +529,14 @@ export class SelectComponent implements OnInit, ControlValueAccessor, AfterConte
     }
 
     public validate(c: FormControl): any {
+        console.log('SelectComponent.validate');
+
         let controlValue = c ? c.value : [];
         if (!controlValue) {
             controlValue = [];
         }
 
-        return (controlValue.length > 0) ? null : {
+        return this.allowClear || (controlValue.length > 0) ? null : {
             ng2SelectEmptyError: {
                 valid: false
             }