Merge branch 'release/v0.7.1'

Author: davidlgj

CHANGELOG

@@ -1,3 +1,10 @@
+v0.7.1
+------
+Thanks to @torstenrudolf, this release is basically his PR:s.
+ * Bugfix: Array validation for Checkboxes
+ * New radios type: 'radios-inline'
+ * Class "control-label" added to labels
+
 v0.7.0
 ------
  * Support for complex keys, at least when using Angular 1.3.

README.md

@@ -158,4 +158,7 @@ $ karma start karma.conf.js
 Contributing
 ------------
 
+**Heads up!** Sometime soon we will go over and change the code style to follow
+whatever [jscs](https://github.com/mdevils/node-jscs) says with preset set to 'google'.
+
 All contributions are welcome! We're trying to use [git flow](http://danielkummer.github.io/git-flow-cheatsheet/), so please base any merge request on the **development** branch instead of **master**.

bower.json

@@ -5,7 +5,7 @@
     "dist/bootstrap-decorator.min.js",
     "dist/bootstrap-datepicker.min.js"
   ],
-  "version": "0.7.0",
+  "version": "0.7.1",
   "authors": [
     "Textalk",
     "David Jensen <[email protected]>"

dist/bootstrap-datepicker.min.js

@@ -4,7 +4,7 @@ Documentation
 1. [Basic Usage](#basic-usage)
 1. [Handling Submit](#handling-submit)
 1. [Global Options](#global-options)
-1. [Form types](#form-types)  
+1. [Form types](#form-types)
 1. [Default form types](#default-form-types)
 1. [Form definitions](#form-definitions)
 1. [Overriding field types and order](#overriding-field-types-and-order)
@@ -190,6 +190,7 @@ Schema Form currently supports the following form field types out of the box:
 | submit        |  a submit button        |
 | button        |  a button               |
 | radios        |  radio buttons          |
+| radios-inline |  radio buttons in one line |
 | radiobuttons  |  radio buttons with bootstrap buttons |
 | help          |  insert arbitrary html |
 | tab           |  tabs with content     |
@@ -312,7 +313,7 @@ General options most field types can handle:
 
 ### onChange
 The ```onChange``` option can be used with most fields and its value should be
-either an angular expression, as a string, or a function. If its an expression  
+either an angular expression, as a string, or a function. If its an expression
 it will be evaluated in the parent scope of the ```sf-schema``` directive with
 the special locals ```modelValue``` and ```form```. If its a function that will
 be called with  ```modelValue``` and ```form``` as first and second arguments.
@@ -876,7 +877,7 @@ It is not needed for tabs on top.
 The `title` option is a bit special in `tabarray`, it defines the title
 of the tab and is considered a angular expression. The expression is evaluated
 with two extra variables in context: **value** and **$index**, where **value**
-is the value in the array (i.e. that tab) and **$index** the index.  
+is the value in the array (i.e. that tab) and **$index** the index.
 
 Example with tabs on the top:
 

dist/bootstrap-decorator.min.js

@@ -101,6 +101,14 @@
           "Tube"
         ]
       },
+      "radio2": {
+        "title": "My Second Radio",
+        "type": "string",
+        "enum": [
+          "Transistor",
+          "Tube"
+        ]
+      },
       "radiobuttons": {
         "type": "string",
         "enum": [
@@ -182,6 +190,20 @@
         }
       ]
     },
+    {
+      "key": "radio2",
+      "type": "radios-inline",
+      "titleMap": [
+        {
+          "value": "Transistor",
+          "name": "Transistor <br> Not the tube kind."
+        },
+        {
+          "value": "Tube",
+          "name": "Tube <br> The tube kind."
+        }
+      ]
+    },
     {
       "key": "radiobuttons",
       "style": {

docs/index.md

@@ -1,6 +1,6 @@
 {
   "name": "angular-schema-form",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Create forms from a JSON schema",
   "scripts": {
     "test": "rm -fr coverage && ./node_modules/karma/bin/karma start --single-run --browsers PhantomJS karma.conf.js && find coverage/ -name lcov.info -print0 | xargs -0 cat | ./node_modules/coveralls/bin/coveralls.js"

examples/data/sink.json

@@ -18,6 +18,7 @@ angular.module('schemaForm').config(['schemaFormDecoratorsProvider',function(dec
     submit: base+'submit.html',
     button: base+'submit.html',
     radios: base+'radios.html',
+    'radios-inline': base+'radios-inline.html',
     radiobuttons: base+'radio-buttons.html',
     help: base+'help.html',
     'default': base+'default.html'
@@ -44,6 +45,7 @@ angular.module('schemaForm').config(['schemaFormDecoratorsProvider',function(dec
     datepicker: base+'datepicker.html',
     input: base+'default.html',
     radios: base+'radios.html',
+    'radios-inline': base+'radios-inline.html',
     radiobuttons: base+'radio-buttons.html',
   });
 

package.json

@@ -1,5 +1,5 @@
-<div sf-array="form" class="form-group" ng-class="{'has-error': hasError(), 'has-success': hasSuccess()}">
-  <label ng-show="showTitle()">{{form.title}}</label>
+<div sf-array="form" ng-model="$$value$$" class="form-group" ng-class="{'has-error': hasError(), 'has-success': hasSuccess()}">
+  <label class="control-label" ng-show="showTitle()">{{form.title}}</label>
   <div class="checkbox" ng-repeat="val in titleMapValues track by $index" >
     <label>
       <input type="checkbox"
@@ -9,5 +9,7 @@
     </label>
 
   </div>
-  <div class="help-block" ng-show="form.description" ng-bind-html="form.description"></div>
+  <div class="help-block"
+       ng-show="(hasError() && errorMessage(schemaError())) || form.description"
+       ng-bind-html="(hasError() && errorMessage(schemaError())) || form.description"></div>
 </div>

src/directives/decorators/bootstrap/bootstrap-decorator.js

@@ -1,5 +1,5 @@
 <div class="form-group" ng-class="{'has-error': hasError()}">
-  <label ng-show="showTitle()">{{form.title}}</label>
+  <label class="control-label" ng-show="showTitle()">{{form.title}}</label>
 
   <input ng-show="form.key"
          style="background-color: white"

src/directives/decorators/bootstrap/checkboxes.html

@@ -1,6 +1,6 @@
 <div class="form-group" ng-class="{'has-error': hasError(), 'has-success': hasSuccess()}">
   <div>
-    <label ng-show="showTitle()">{{form.title}}</label>
+    <label class="control-label" ng-show="showTitle()">{{form.title}}</label>
   </div>
   <div class="btn-group">
     <label class="btn {{ (item.value === $$value$$) ? form.style.selected || 'btn-primary' : form.style.unselected || 'btn-primary'; }}"

src/directives/decorators/bootstrap/datepicker/datepicker.html

@@ -0,0 +1,13 @@
+<div class="form-group" ng-class="{'has-error': hasError(), 'has-success': hasSuccess()}">
+  <label class="control-label" ng-show="showTitle()">{{form.title}}</label>
+  <div>
+      <label class="radio-inline" ng-repeat="item in form.titleMap" >
+      <input type="radio"
+             sf-changed="form"
+             ng-model="$$value$$"
+             ng-value="item.value">
+      <span ng-bind-html="item.name"></span>
+    </label>
+  </div>
+  <div class="help-block" ng-show="(hasError() && errorMessage(schemaError())) || form.description" ng-bind-html="(hasError() && errorMessage(schemaError())) || form.description"></div>
+</div>

src/directives/decorators/bootstrap/radio-buttons.html

@@ -1,5 +1,5 @@
 <div class="form-group" ng-class="{'has-error': hasError(), 'has-success': hasSuccess()}">
-  <label ng-show="showTitle()">{{form.title}}</label>
+  <label class="control-label" ng-show="showTitle()">{{form.title}}</label>
   <div class="radio" ng-repeat="item in form.titleMap" >
     <label>
       <input type="radio"
@@ -10,5 +10,5 @@
       <span ng-bind-html="item.name"></span>
     </label>
   </div>
-  <div class="help-block" ng-show="form.description" ng-bind-html="form.description"></div>
+  <div class="help-block" ng-show="(hasError() && errorMessage(schemaError())) || form.description" ng-bind-html="(hasError() && errorMessage(schemaError())) || form.description"></div>
 </div>

src/directives/decorators/bootstrap/radios-inline.html

@@ -1,5 +1,5 @@
 <div class="form-group" ng-class="{'has-error': hasError(), 'has-success': hasSuccess(), 'has-feedback': form.feedback !== false}">
-  <label ng-show="showTitle()">
+  <label class="control-label" ng-show="showTitle()">
     {{form.title}}
   </label>
   <select ng-model="$$value$$"