Fix for validation bug in radios

And also some convinience methods on the builder.

Author: davidlgj

dist/bootstrap-decorator.js

@@ -299,6 +299,13 @@ angular.module('schemaForm').provider('sfBuilder', ['sfPathProvider', function(s
     }
   };
   this.builders = builders;
+  var stdBuilders = [
+    builders.sfField,
+    builders.ngModel,
+    builders.ngModelOptions,
+    builders.condition
+  ];
+  this.stdBuilders = stdBuilders;
 
   this.$get = ['$templateCache', 'schemaFormDecorators', 'sfPath', function($templateCache, schemaFormDecorators, sfPath) {
 
@@ -408,6 +415,7 @@ angular.module('schemaForm').provider('sfBuilder', ['sfPathProvider', function(s
 
       },
       builder: builders,
+      stdBuilders: stdBuilders,
       internalBuild: build
     };
   }];
@@ -435,8 +443,16 @@ angular.module('schemaForm').provider('schemaFormDecorators',
     return decorator['default'].template;
   };
 
-  var createDirective = function(name) {
-    $compileProvider.directive(name,
+  /**************************************************
+   * DEPRECATED                                     *
+   * The new builder and sf-field is preferred, but *
+   * we keep this in during a transitional period   *
+   * so that add-ons that don't use the new builder *
+   * works.                                         *
+   **************************************************/
+   //TODO: Move to a compatability extra script.
+   var createDirective = function(name) {
+     $compileProvider.directive(name,
       ['$parse', '$compile', '$http', '$templateCache', '$interpolate', '$q', 'sfErrorMessage',
        'sfPath','sfSelect',
       function($parse,  $compile,  $http,  $templateCache, $interpolate, $q, sfErrorMessage,
@@ -541,35 +557,20 @@ angular.module('schemaForm').provider('schemaFormDecorators',
               return (expression && $interpolate(expression)(locals));
             };
 
-            //This works since we get the ngModel from the array or the schema-validate directive.
+            //This works since we ot the ngModel from the array or the schema-validate directive.
             scope.hasSuccess = function() {
               if (!scope.ngModel) {
                 return false;
               }
-              if (scope.options && scope.options.pristine &&
-                  scope.options.pristine.success === false) {
-                return scope.ngModel.$valid &&
-                    !scope.ngModel.$pristine && !scope.ngModel.$isEmpty(scope.ngModel.$modelValue);
-              } else {
-                return scope.ngModel.$valid &&
+              return scope.ngModel.$valid &&
                   (!scope.ngModel.$pristine || !scope.ngModel.$isEmpty(scope.ngModel.$modelValue));
-              }
             };
 
             scope.hasError = function() {
               if (!scope.ngModel) {
                 return false;
               }
-              if (!scope.options || !scope.options.pristine || scope.options.pristine.errors !== false) {
-                // Show errors in pristine forms. The default.
-                // Note that "validateOnRender" option defaults to *not* validate initial form.
-                // so as a default there won't be any error anyway, but if the model is modified
-                // from the outside the error will show even if the field is pristine.
-                return scope.ngModel.$invalid;
-              } else {
-                // Don't show errors in pristine forms.
-                return scope.ngModel.$invalid && !scope.ngModel.$pristine;
-              }
+              return scope.ngModel.$invalid && !scope.ngModel.$pristine;
             };
 
             /**
@@ -819,17 +820,22 @@ angular.module('schemaForm').provider('schemaFormDecorators',
 
 
   /**
-   * Create a decorator directive and its sibling "manual" use decorators.
-   * The directive can be used to create form fields or other form entities.
-   * It can be used in conjunction with <schema-form> directive in which case the decorator is
-   * given it's configuration via a the "form" attribute.
+   * Define a decorator. A decorator is a set of form types with templates and builder functions
+   * that help set up the form.
    *
-   * ex. Basic usage
-   *   <sf-decorator form="myform"></sf-decorator>
-   **
    * @param {string} name directive name (CamelCased)
    * @param {Object} fields, an object that maps "type" => `{ template, builder, replace}`.
                      attributes `builder` and `replace` are optional, and replace defaults to true.
+
+                     `template` should be the key of the template to load and it should be pre-loaded
+                     in `$templateCache`.
+
+                     `builder` can be a function or an array of functions. They will be called in
+                     the order they are supplied.
+
+                     `replace` (DEPRECATED) is for backwards compatability. If false the builder
+                     will use the "old" way of building that form field using a <sf-decorator>
+                     directive.
    */
   this.defineDecorator = function(name, fields) {
     decorators[name] = {'__name': name}; // TODO: this feels like a hack, come up with a better way.
@@ -847,6 +853,7 @@ angular.module('schemaForm').provider('schemaFormDecorators',
   };
 
   /**
+   * DEPRECATED
    * Creates a directive of a decorator
    * Usable when you want to use the decorators without using <schema-form> directive.
    * Specifically when you need to reuse styling.
@@ -861,6 +868,7 @@ angular.module('schemaForm').provider('schemaFormDecorators',
   this.createDirective = createManualDirective;
 
   /**
+   * DEPRECATED
    * Same as createDirective, but takes an object where key is 'type' and value is 'templateUrl'
    * Useful for batching.
    * @param {Object} templates
@@ -883,6 +891,7 @@ angular.module('schemaForm').provider('schemaFormDecorators',
 
 
   /**
+   * DEPRECATED use defineAddOn() instead.
    * Adds a mapping to an existing decorator.
    * @param {String} name Decorator name
    * @param {String} type Form type for the mapping
@@ -900,6 +909,25 @@ angular.module('schemaForm').provider('schemaFormDecorators',
     }
   };
 
+  /**
+   * Adds an add-on to an existing decorator.
+   * @param {String} name Decorator name
+   * @param {String} type Form type for the mapping
+   * @param {String} url  The template url
+   * @param {Function|Array} builder (optional) builder function(s),
+   */
+  this.defineAddOn = function(name, type, url, builder) {
+    if (decorators[name]) {
+      decorators[name][type] = {
+        template: url,
+        builder: builder,
+        replace: true
+      };
+    }
+  };
+
+
+
   //Service is just a getter for directive templates and rules
   this.$get = function() {
     return {

dist/bootstrap-decorator.min.js

@@ -99,7 +99,7 @@ Example with custom submit buttons:
 Handling Submit
 ---------------
 Schema Form does not care what you do with your data, to handle form submit
-the recomended way is to use the `ng-submit` directive. It's also recomended
+the recommended way is to use the `ng-submit` directive. It's also recommended
 to use a `name` attribute on your form so you can access the
 [FormController](https://code.angularjs.org/1.3.0-beta.15/docs/api/ng/type/form.FormController)
 and check if the form is valid or not.
@@ -161,7 +161,7 @@ Updating Form
 -------------
 
 Schema Form watches `sf-form` and `sf-schema` and will redraw the form if one or both changes, but
-only if they change completly, i.e. not the same object and/or form instance. For performance
+only if they change completely, i.e. not the same object and/or form instance. For performance
 reasons we have opted to not watch schema and form deeply. So if you have updated a part of the
 schema or the form definition you can trigger a redraw by issuing the event `schemaFormRedraw`.
 
@@ -187,15 +187,13 @@ attribute which should be placed along side `sf-schema`.
 `sf-options` takes an object with the following possible attributes.
 
 
-| Attribute     |  Type |                    |
-|:--------------|:------|:-------------------|
-| supressPropertyTitles | boolean  |by default schema form uses the property name in the schema as a title if none is specified, set this to true to disable that behavior |
-| formDefaults | object | an object that will be used as a default for all form definitions |
-| validationMessage | object or function | Object or a function that will be used as default validation message for all fields. See [Validation Messages](#validation-messages) for details. |
-| setSchemaDefaults | boolean | Should schema defaults be set on model. |
-| destroyStrategy | string | the default strategy to use for cleaning the model when a form element is removed. see [destroyStrategy](#destroyStrategy) below |
-| pristine  | Object `{errors ,success}` | Sets if errors and success states should be visible when form field are `$pristine`. Default is `{errors: true, success: true}` |
-| validateOnRender | boolean | Should form be validated on initial render? Default `false` |
+| Attribute     |                         |
+|:--------------|:------------------------|
+| supressPropertyTitles | by default schema form uses the property name in the schema as a title if none is specified, set this to true to disable that behavior |
+| formDefaults | an object that will be used as a default for all form definitions |
+| validationMessage | an object or a function that will be used as default validation message for all fields. See [Validation Messages](#validation-messages) for details. |
+| setSchemaDefaults | boolean, set to false an no defaults from the schema will be set on the model. |
+| destroyStrategy | the default strategy to use for cleaning the model when a form element is removed. see [destroyStrategy](#destroyStrategy) below |
 
 *formDefaults* is mostly useful for setting global [ngModelOptions](#ngmodeloptions)
 i.e. changing the entire form to validate on blur.

dist/schema-form.js

@@ -1,17 +1,19 @@
 <div class="form-group schema-form-radios-inline {{form.htmlClass}}"
      ng-class="{'has-error': form.disableErrorState !== true &&  hasError(), 'has-success': form.disableSuccessState !== true && hasSuccess()}">
-  <label class="control-label {{form.labelHtmlClass}}" ng-show="showTitle()">{{form.title}}</label>
+  <label  ng-model="$$value$$"
+          ng-model-options="form.ngModelOptions"
+          schema-validate="form"
+          class="control-label {{form.labelHtmlClass}}" ng-show="showTitle()">{{form.title}}</label>
   <div>
-      <label class="radio-inline" ng-repeat="item in form.titleMap" >
-      <input type="radio"
-             class="{{form.fieldHtmlClass}}"
-             sf-changed="form"
-             ng-disabled="form.readonly"
-             ng-model="$$value$$"
-             schema-validate="form"
-             ng-value="item.value"
-             name="{{form.key.join('.')}}">
-      <span ng-bind-html="item.name"></span>
+      <label class="radio-inline" ng-repeat="item in form.titleMap">
+        <input type="radio"
+               class="{{form.fieldHtmlClass}}"
+               sf-changed="form"
+               ng-disabled="form.readonly"
+               ng-model="$$value$$"
+               ng-value="item.value"
+               name="{{form.key.join('.')}}">
+        <span ng-bind-html="item.name"></span>
     </label>
   </div>
   <div class="help-block" sf-message="form.description"></div>

dist/schema-form.min.js

@@ -1,4 +1,5 @@
-<div class="form-group schema-form-radios {{form.htmlClass}}" ng-class="{'has-error': form.disableErrorState !== true &&  hasError(), 'has-success': form.disableSuccessState !== true && hasSuccess()}">
+<div class="form-group schema-form-radios {{form.htmlClass}}"
+     ng-class="{'has-error': form.disableErrorState !== true &&  hasError(), 'has-success': form.disableSuccessState !== true && hasSuccess()}">
   <label  ng-model="$$value$$"
           ng-model-options="form.ngModelOptions"
           schema-validate="form"
@@ -10,7 +11,6 @@
              sf-changed="form"
              ng-disabled="form.readonly"
              ng-model="$$value$$"
-             ng-model-options="form.ngModelOptions"
              ng-value="item.value"
              name="{{form.key.join('.')}}">
       <span ng-bind-html="item.name"></span>

docs/index.md

@@ -157,6 +157,13 @@ angular.module('schemaForm').provider('sfBuilder', ['sfPathProvider', function(s
     }
   };
   this.builders = builders;
+  var stdBuilders = [
+    builders.sfField,
+    builders.ngModel,
+    builders.ngModelOptions,
+    builders.condition
+  ];
+  this.stdBuilders = stdBuilders;
 
   this.$get = ['$templateCache', 'schemaFormDecorators', 'sfPath', function($templateCache, schemaFormDecorators, sfPath) {
 
@@ -266,6 +273,7 @@ angular.module('schemaForm').provider('sfBuilder', ['sfPathProvider', function(s
 
       },
       builder: builders,
+      stdBuilders: stdBuilders,
       internalBuild: build
     };
   }];