Merge branch 'release/0.0.2'

Author: Kamil Kisiela

.versions

@@ -0,0 +1,59 @@
+[email protected]
+angular:[email protected]
+angular:[email protected]
+angular:[email protected]
+angular:[email protected]
+angular:[email protected]
+[email protected]_1
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+dburles:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+lai:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+mys:[email protected]
+[email protected]_1
+[email protected]
+[email protected]
+pbastowski:[email protected]
+pbastowski:[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]

CHANGELOG.md

@@ -4,5 +4,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-## 0.0.1 - 
+## [0.0.2] - 2015-11-07
+### Fixed
+- Add missing ngMessages
 
+### Added
+- showError in Messages wrapper 
+- md-checkbox
+- mdTheme to checkbox, switch
+- md-switch
+
+## 0.0.1 - 2015-11-06
+
+[Unreleased]: https://github.com/kamilkisiela/meteor-angular-formly-templates-material/compare/0.2.0...HEAD
+[0.0.2]: https://github.com/kamilkisiela/meteor-angular-formly-templates-material/compare/0.0.1...0.0.2

README.md

@@ -3,7 +3,9 @@ FormlyMaterial
 
 Material Design Templates for [Angular-Formly](http://angular-formly.com). Modern & flexible forms configured easily in a JSON object.
 
-**Angular Formly is not part of Atmosphere. You have to add it manually**
+## Add Angular Formly
+
+There is no official Angular Formly package in Atmosphere so you have to add it manually.
 
 ## Install
 
@@ -14,34 +16,36 @@ meteor add mys:angular-formly-templates-material
 
 ## Getting Started
 
-1. Add package using `meteor add`
-2. Add manually angular-formly library to your project
-3. Add the following dependencies to your Angular module:
+1. Add package using `meteor add` (see above)
+2. Add angular-formly files to your project
+3. Add the following dependencies to your AngularJS module:
 
 ```javascript
 angular.module('myAppName', [
-    'ngMessages',
-    'ngMaterial',
-    'formly',
     'formlyMaterial'
   ])
 ```
 
 # Components
 
+_rest of angular-material directive in near future_
+
 ## Fields
 
 - input
-- _rest fields in near future_
+- checkbox
 
 ## Wrappers
 
 - mdInputContainer
 - label
 - ngMessages
 
-##Roadmap
-- all basic fields
-- basic wrappers
+## Roadmap
+- add md-chips
+- add md-datepicker
+- add md-icon wrapper
+- add md-radio-button and md-radio-group
+- add md-select
 - e2e tests
 - Requests (?). Post an issue.

lib/client/main.js

@@ -1,6 +1,7 @@
 var {SetModule} = angular2now;
 
 SetModule('formlyMaterial', [
+    'ngMessages',
     'ngMaterial',
     'formly'
 ])

lib/client/types/checkbox/checkbox.js

@@ -0,0 +1,11 @@
+var {SetModule} = angular2now;
+
+SetModule('formlyMaterial')
+    .config((formlyConfigProvider, formlyMaterialProvider) => {
+
+        formlyConfigProvider.setType({
+            name: 'checkbox',
+            templateUrl: formlyMaterialProvider.templateUrl('lib/client/types/checkbox/checkbox.ng.html')
+        });
+
+    });

lib/client/types/checkbox/checkbox.ng.html

@@ -0,0 +1,5 @@
+<div>
+    <md-checkbox ng-model="model[options.key]" md-theme="{{to.mdTheme || 'primary'}}">
+        {{to.label}}
+    </md-checkbox>
+</div>

lib/client/types/switch/switch.js

@@ -0,0 +1,11 @@
+var {SetModule} = angular2now;
+
+SetModule('formlyMaterial')
+    .config((formlyConfigProvider, formlyMaterialProvider) => {
+
+        formlyConfigProvider.setType({
+            name: 'switch',
+            templateUrl: formlyMaterialProvider.templateUrl('lib/client/types/switch/switch.ng.html')
+        });
+
+    });

lib/client/types/switch/switch.ng.html

@@ -0,0 +1,3 @@
+<md-switch ng-model="model[options.key]" md-theme="{{to.mdTheme || 'primary'}}">
+    {{to.label}}
+</md-switch>

lib/client/wrappers/label/label.ng.html

@@ -1,4 +1,4 @@
-<label for="{{id}}" class="control-label">
+<label for="{{id}}">
     {{to.label}}
     {{to.required ? '*' : ''}}
 </label>

lib/client/wrappers/messages/messages.ng.html

@@ -1,6 +1,7 @@
 <formly-transclude></formly-transclude>
-<div ng-messages="fc.$error" ng-show="showError">
+<div ng-messages="fc.$error">
     <div ng-repeat="(name, message) in ::options.validation.messages"
+         ng-if="showError"
          ng-message={{::name}}>{{message(fc.$viewValue, fc.$modelValue, this)}}
     </div>
 </div>