Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	package.json
#	src/material-decorator.js
#	src/material/actions-trcl.html
#	src/material/actions.html
#	src/material/card-content.html
#	src/material/card.html
#	src/material/fieldset.html
#	src/material/help.html
#	src/module.js
#	webpack.config.js

Author: Anthropic

src/angular-schema-form-material-templates.js

@@ -84,7 +84,7 @@ function materialDecoratorConfig(
     tabs: { template: tabsTemplate, builder: [ sfField, mdTabs, condition ] },
     tabarray: { template: tabarrayTemplate, builder: arrays },
     textarea: { template: textareaTemplate, builder: defaults.concat(textarea) },
-    switch: { template: switchTemplate, builder: defaults.concat(mdSwitch) }
+    'switch': { template: switchTemplate, builder: defaults.concat(mdSwitch) }
   });
 
   function sfLayout(args) {

src/material-decorator.js

@@ -1,4 +1,4 @@
-<div  class="schema-form-array {{form.htmlClass}}"
+<div  class="schema-form-array {{::form.htmlClass}}"
       sf-field-model="sf-new-array"
       sf-new-array>
   <label class="control-label" ng-show="showTitle()">{{ form.title }}</label>
@@ -7,7 +7,7 @@
              sf-field-model="ng-repeat"
              ng-repeat="item in modelArray track by $index"
              schema-form-array-items
-             class="{{form.fieldHtmlClass}}">
+             class="{{::form.fieldHtmlClass}}">
       <md-button flex="none" flex-order="2"
                  type="button"
                  ng-hide="form.readonly || form.remove === null"

src/material/array.html

@@ -1,4 +1,4 @@
-<div class="form-group {{form.htmlClass}} schema-form-select"
+<div class="form-group {{::form.htmlClass}} schema-form-select"
      ng-class="{'has-error': hasError(), 'has-success': hasSuccess(), 'has-feedback': form.feedback !== false}"
      sf-messages sf-layout>
   <md-autocomplete flex

src/material/autocomplete.html

@@ -1,4 +1,4 @@
-<div class="form-group schema-form-chips {{form.htmlClass}}"
+<div class="form-group schema-form-chips {{::form.htmlClass}}"
      ng-class="{'has-error': hasError(), 'has-success': hasSuccess(), 'has-feedback': form.feedback !== false}">
   <md-chips sf-field-model readonly="form.readonly" flex
             placeholder="{{::form.title}}">

src/material/chips.html

@@ -7,7 +7,7 @@
          type="{{::form.type}}"
          step="any"
          sf-changed="form"
-         placeholder="{{form.placeholder}}"
+         placeholder="{{::form.placeholder}}"
          id="{{::form.key|sfCamelKey}}"
          ng-class="::form.fieldHtmlClass"
          sf-type-parser="form.schema"

src/material/default.html

@@ -1,4 +1,4 @@
-<fieldset ng-disabled="form.readonly" class="standard {{form.htmlClass}}" flex>
+<fieldset ng-disabled="form.readonly" class="standard {{::form.htmlClass}}" flex>
   <legend ng-show="form.title">{{ form.title }}</legend>
   <div ng-transclude></div>
 </fieldset>

src/material/fieldset-trcl.html

@@ -1,4 +1,4 @@
-<div class="form-group schema-form-radiobuttons {{form.htmlClass}}"
+<div class="form-group schema-form-radiobuttons {{::form.htmlClass}}"
      ng-class="{'has-error': hasError(), 'has-success': hasSuccess()}" sf-layout sf-messages>
   <div>
     <label class="control-label" ng-show="showTitle()">{{form.title}}</label>
@@ -10,7 +10,7 @@
                  sf-field-model="replaceAll"
                  ng-model="$$value$$"
                  sf-changed="form"
-                 class="radio {{form.fieldHtmlClass}}"
+                 class="radio {{::form.fieldHtmlClass}}"
                  ng-class="{'md-primary': ($$value$$ == item.value)}"
                  ng-disabled="form.readonly"
                  ng-model-options="form.ngModelOptions"

src/material/radio-buttons.html

@@ -1,10 +1,10 @@
-<div class="form-group schema-form-radios-inline {{form.htmlClass}}"
+<div class="form-group schema-form-radios-inline {{::form.htmlClass}}"
      ng-class="{'has-error': hasError(), 'has-success': hasSuccess()}" sf-layout sf-messages>
   <label class="control-label" ng-show="showTitle()">{{form.title}}</label>
   <md-radio-group layout="row"
                   sf-field-model="replaceAll"
                   ng-model="$$value$$"
-                  class="{{form.fieldHtmlClass}}"
+                  class="{{::form.fieldHtmlClass}}"
                   ng-class="{ active: item.value === $$value$$ }"
                   sf-changed="form"
                   schema-validate="form"

src/material/radios-inline.html

@@ -1,4 +1,4 @@
-<div class="form-group schema-form-radios {{form.htmlClass}}"
+<div class="form-group schema-form-radios {{::form.htmlClass}}"
      ng-class="{'has-error': hasError(), 'has-success': hasSuccess()}">
   <label class="control-label" ng-show="showTitle()" aria-label="{{form.title}}" layout="row">{{form.title}} {{form.titleMap | json}}</label>
   <div>
@@ -9,7 +9,7 @@
                     sf-layout sf-messages>
       <md-radio-button ng-repeat="item in form.titleMap"
                        ng-value="item.value"
-                       class="{{form.fieldHtmlClass}}"
+                       class="{{::form.fieldHtmlClass}}"
                        sf-field-model="ng-class"
                        ng-class="{ active: item.value === $$value$$ }">
         <span ng-bind-html="item.name"></span>

src/material/radios.html

@@ -1,4 +1,4 @@
-<md-input-container class="schema-form-slider {{form.htmlClass}}">
+<md-input-container class="schema-form-slider {{::form.htmlClass}}">
   <label  ng-show="showTitle()" for="{{::form.key|sfCamelKey}}">{{::form.title}}</label>
   <md-slider sf-field-model
              flex

src/material/slider.html

@@ -1,5 +1,5 @@
-<section class="schema-form-submit {{form.htmlClass}}" sf-messages>
-  <md-button class="md-raised {{ form.style || 'md-primary' }} {{form.fieldHtmlClass}}"
+<section class="schema-form-submit {{::form.htmlClass}}" sf-messages>
+  <md-button class="md-raised {{ form.style || 'md-primary' }} {{::form.fieldHtmlClass}}"
              type="{{::form.type}}"
              ng-disabled="form.readonly"
              aria-label="{{::form.title}}">