Merge branch 'feature/with-builder' into develop

Author: davidlgj

README.md

@@ -21,6 +21,6 @@ There is also a `gulp watch` task that minifys on change.
 Known Issues
 ------------
   * Almost nothing work
-  * Only inputs and textare are implemented
-  * No angular material "theme". Looks like an issue with us using $compile in the link function of
-    our directives.  
+  * Only inputs and textarea are implemented
+  * ngModelOptions doesn't work
+  * Angular material theme only works when `$mdThemingProvider.alwaysWatchTheme(true);` is used.

examples/material-example.html

@@ -252,6 +252,12 @@ <h3>Schema</h3>
     ngClipProvider.setPath('//cdnjs.cloudflare.com/ajax/libs/zeroclipboard/2.2.0/ZeroClipboard.swf');
   }]);*/
 
+app.config(function($mdThemingProvider) {
+  $mdThemingProvider.setDefaultTheme('default')
+  $mdThemingProvider.alwaysWatchTheme(true);
+});
+
+
 app.controller('TestCtrl', function($scope, $http, $location) {
 
   $scope.tests = [

src/default.html

@@ -25,11 +25,10 @@
          sf-changed="form"
          placeholder="{{form.placeholder}}"
          id="{{form.key.slice(-1)[0]}}"
-         ng-model-options="form.ngModelOptions"
          ng-class="form.fieldHtmlClass"
          ng-disabled="form.readonly"
          name="{{form.key.slice(-1)[0]}}"
          schema-validate="form">
-</md-input-container>
 
-<div sf-message="form.description"></div>
+         <div sf-message="form.description"></div>
+</md-input-container>

src/material-decorator.js

@@ -1,7 +1,13 @@
 angular.module('schemaForm').config(['schemaFormDecoratorsProvider', function(decoratorsProvider) {
   var base = 'decorators/material/';
 
-  decoratorsProvider.createDecorator('materialDecorator', {
+  decoratorsProvider.defineDecorator('materialDecorator', {
+    textarea: {template: base + 'textarea.html'},
+    'default': {template: base + 'default.html'},
+    submit: {template: base + 'submit.html'}
+  });
+
+/*  decoratorsProvider.createDecorator('materialDecorator', {
     textarea: base + 'textarea.html',
     fieldset: base + 'fieldset.html',
     array: base + 'array.html',
@@ -22,5 +28,5 @@ angular.module('schemaForm').config(['schemaFormDecoratorsProvider', function(de
     radiobuttons: base + 'radio-buttons.html',
     help: base + 'help.html',
     'default': base + 'default.html'
-  }, []);
+  });*/
 }]);

src/textarea.html

@@ -4,12 +4,10 @@
   <textarea ng-class="form.fieldHtmlClass"
             id="{{form.key.slice(-1)[0]}}"
             sf-changed="form"
-            placeholder="{{form.placeholder}}"
             ng-disabled="form.readonly"
             ng-model="$$value$$"
-            ng-model-options="form.ngModelOptions"
             schema-validate="form"
             name="{{form.key.slice(-1)[0]}}"></textarea>
 
+  <span class="help-block" sf-message="form.description"></span>
 </md-input-container>
-<span class="help-block" sf-message="form.description"></span>