Merge branch 'release/v0.4.0' into develop

Author: Kamil Kisiela

CHANGELOG.md

@@ -2,12 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+## [0.4.0] - 2015-11-17
 ### Added
-- md-chip with placeholder, secondary-placeholder, delete-button-label and delete-hint
-
-### Changed
-- **mdLabel** wrapper changed to **label** 
+- **md-chip** with placeholder, secondary-placeholder, delete-button-label and delete-hint
+ 
+### Deprecated
+- **mdInputContainer** wrapper. Use **inputContainer**
+- **mdMessages** wrapper. Use **messages**
+- **mdLabel** wrapper. Use **label**
 
 ## [0.3.0] - 2015-11-17
 ### Added
@@ -49,7 +51,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## 0.0.1 - 2015-11-06
 
-[Unreleased]: https://github.com/wieldo/meteor-angular-formly-templates-material/compare/v0.3.0...HEAD
+[0.4.0]: https://github.com/wieldo/meteor-angular-formly-templates-material/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/wieldo/meteor-angular-formly-templates-material/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/wieldo/meteor-angular-formly-templates-material/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/wieldo/meteor-angular-formly-templates-material/compare/v0.0.4...v0.1.0

README.md

@@ -183,11 +183,44 @@ md-filter-date
 }
 ```
 
+### chips
+
+**placeholder (string, optional)**
+
+placeholder attribute value
+
+**secondaryPlaceholder (string, optional)**
+
+secondary-placeholder attribute value
+
+**deleteButtonLabel (string, optional)**
+
+delete-button-label attribute value
+
+**deleteHint (string, optional)**
+
+delete-hint attribute value
+
+```javascript
+{
+  "type": "chips",
+  "key": "tags",
+  "templateOptions": {
+    "theme": "custom",
+    "placeholder": "+tags",
+    "secondaryPlaceholder": "Add tag",
+    "deleteButtonLabel": "Remove",
+    "deleteHint": "Remove tag"
+  }
+}
+```
+
+
 ## Wrappers
 
-- mdInputContainer
+- inputContainer (md-input-container)
 - label
-- mdMessages
+- messages (ng-messages)
 
 ## Roadmap
 

lib/client/types/datepicker/datepicker.js

@@ -6,7 +6,7 @@ SetModule('formlyMaterial')
         formlyConfigProvider.setType({
             name: 'datepicker',
             templateUrl: formlyMaterialProvider.templateUrl('lib/client/types/datepicker/datepicker.ng.html'),
-            wrapper: ['mdMessages'],
+            wrapper: ['messages'],
             defaultOptions: {
                 ngModelAttrs: {
                     placeholder: {attribute: 'md-placeholder'}

lib/client/types/input/input.js

@@ -6,7 +6,7 @@ SetModule('formlyMaterial')
         formlyConfigProvider.setType({
             name: 'input',
             templateUrl: formlyMaterialProvider.templateUrl('lib/client/types/input/input.ng.html'),
-            wrapper: ['label', 'mdMessages', 'mdInputContainer'],
+            wrapper: ['label', 'messages', 'inputContainer'],
             defaultOptions: {
                 ngModelAttrs: {
                     mdMaxlength: {

lib/client/types/select/select.js

@@ -6,7 +6,7 @@ SetModule('formlyMaterial')
         formlyConfigProvider.setType({
             name: 'select',
             templateUrl: formlyMaterialProvider.templateUrl('lib/client/types/select/select.ng.html'),
-            wrapper: ['label', 'mdMessages', 'mdInputContainer'],
+            wrapper: ['label', 'messages', 'inputContainer'],
             apiCheck: (check) => ({
                 templateOptions: {
                     options: check.arrayOf(check.object),

lib/client/types/textarea/textarea.js

@@ -6,7 +6,7 @@ SetModule('formlyMaterial')
         formlyConfigProvider.setType({
             name: 'textarea',
             templateUrl: formlyMaterialProvider.templateUrl('lib/client/types/textarea/textarea.ng.html'),
-            wrapper: ['label', 'mdMessages', 'mdInputContainer'],
+            wrapper: ['label', 'messages', 'inputContainer'],
             defaultOptions: {
                 ngModelAttrs: {
                     rows: {attribute: 'rows'},

lib/client/wrappers/input-container/input-container.js

@@ -3,9 +3,17 @@ var {SetModule} = angular2now;
 SetModule('formlyMaterial')
     .config((formlyConfigProvider, formlyMaterialProvider) => {
 
+        /**
+         * @deprecated since version 0.4.0
+         */
         formlyConfigProvider.setWrapper({
             name: 'mdInputContainer',
             templateUrl: formlyMaterialProvider.templateUrl('lib/client/wrappers/input-container/input-container.ng.html')
         });
 
+        formlyConfigProvider.setWrapper({
+            name: 'inputContainer',
+            templateUrl: formlyMaterialProvider.templateUrl('lib/client/wrappers/input-container/input-container.ng.html')
+        });
+
     });

lib/client/wrappers/messages/messages.js

@@ -3,9 +3,17 @@ var {SetModule} = angular2now;
 SetModule('formlyMaterial')
     .config((formlyConfigProvider, formlyMaterialProvider) => {
 
+        /**
+         * @deprecated since version 0.4.0
+         */
         formlyConfigProvider.setWrapper({
             name: 'mdMessages',
             templateUrl: formlyMaterialProvider.templateUrl('lib/client/wrappers/messages/messages.ng.html')
         });
 
+        formlyConfigProvider.setWrapper({
+            name: 'messages',
+            templateUrl: formlyMaterialProvider.templateUrl('lib/client/wrappers/messages/messages.ng.html')
+        });
+
     });

package.js

@@ -3,7 +3,7 @@ var client = 'client';
 Package.describe({
     name: "wieldo:angular-formly-templates-material",
     summary: "Material design templates for angular-formly",
-    version: "0.3.0",
+    version: "0.4.0",
 
     documentation: 'README.md',
     git: 'https://github.com/wieldo/angular-formly-templates-material.git'