redo work from indexiatech/ember-forms#52

piceaTech · Sep 12, 2015 · 8167388 · 8167388
1 parent 907b226
commit 8167388
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/addon/components/em-form-group.js b/addon/components/em-form-group.js
@@ -24,6 +24,8 @@ Syntax:
     validationIcons: true
     //Label of the form group, default is a human friendly form of the property name
     label="Some label"
+    //if true show all errors, by default inherited from the form
+    showAllErrors=false
 }}
  */
 export default Ember.Component.extend(InFormMixin, HasPropertyMixin, HasPropertyValidationMixin, {
@@ -59,6 +61,7 @@ export default Ember.Component.extend(InFormMixin, HasPropertyMixin, HasProperty
   }),
   v_icons: Ember.computed.deprecatingAlias('validationIcons'),
   validationIcons: Ember.computed.alias('form.validationIcons'),
+  showAllErrors: Em.computed.alias('form.showAllErrors'),
   v_success_icon: Ember.computed.deprecatingAlias('successIcon'),
   successIcon: 'fa fa-check',
   v_warn_icon: Ember.computed.deprecatingAlias('warningIcon'),
@@ -86,6 +89,10 @@ export default Ember.Component.extend(InFormMixin, HasPropertyMixin, HasProperty
       }
     }
   }),
+  canShowErrors: Ember.computed('showAllErrors', 'canShowErrorsFromFocus', function() {
+    return (this.get('showAllErrors')) || this.get('canShowErrorsFromFocus');
+  }),
+
   hideValidationsOnFormChange: Ember.observer('form', 'form.model', function() {
     this.set('canShowErrors', false);
   }),
@@ -110,7 +117,7 @@ export default Ember.Component.extend(InFormMixin, HasPropertyMixin, HasProperty
 
   focusIn() {
     if (this.get('form.showErrorsOnFocusIn')) {
-      return this.set('canShowErrors', true);
+      return this.set('canShowErrorsFromFocus', true);
     }
   },
 

diff --git a/addon/components/em-form.js b/addon/components/em-form.js
@@ -19,6 +19,8 @@ Syntax:
     submitButton=true|false
     //if true validation icons will be rendered
     validationIcons=true|false
+    //if true show all errors whether user entered something in the field or not
+    showAllErrors=true|false
 }}
 */
 export default Ember.Component.extend({
@@ -49,6 +51,7 @@ export default Ember.Component.extend({
   submit_button: Ember.computed.deprecatingAlias('submitButton'),
   submitButton: true,
   v_icons: Ember.computed.deprecatingAlias('validationIcons'),
+  showAllErrors: false,
   validationIcons: true,
   showErrorsOnRender: false,
   showErrorsOnFocusIn: false,