minor fixes to labels etc

Author: matt-sanders

README.md

@@ -110,6 +110,7 @@ These should be added to the `templateOptions` property. Some input types may ha
 
 | Property | Type | Default | Description |
 | --- | --- | --- | --- |
+| label | `string` | `null` | A string containing the field label |
 | onBlur | `function(e)` | `null` | A function to run on @blur event |
 | onFocus | `function(e)` | `null` | A function to run on @focus event |
 | onClick | `function(e)` | `null` | A function to run on @click event |
@@ -124,7 +125,7 @@ These should be added to the `templateOptions` property. Some input types may ha
 
 | Property | Type | Default | Description |
 | --- | --- | --- | --- |
-| type | `string` | `text` | The 'type' attribute to pass to the input. Can be any valid input type. |
+| inputType | `string` | `text` | The 'type' attribute to pass to the input. Can be any valid input type. |
 
 ####List options
 

dist/vue-formly-bootstrap.js

@@ -1,5 +1,5 @@
 /**
- * vue-formly-bootstrap v2.0.0
+ * vue-formly-bootstrap v2.0.1
  * https://github.com/matt-sanders/vue-formly-bootstrap
  * Released under the MIT License.
  */
@@ -761,7 +761,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /* 41 */
 /***/ function(module, exports) {
 
-	module.exports = "\n<div class=\"form-group formly-input\" :class=\"[ to.type, {'formly-has-value': model[field.key], 'formly-has-focus': form[field.key].$active}]\">\n  <label v-if=\"to.label\" :for=\"to.id ? to.id : null\">{{to.label}}</label>\n  <input class=\"form-control\" :class=\"to.classes\" :id=\"to.id ? to.id : null\" type=\"text\"  v-model=\"model[field.key]\" @blur=\"onBlur\" @focus=\"onFocus\" @click=\"onClick\" @change=\"onChange\" @keyup=\"onKeyup\" @keydown=\"onKeydown\" v-formly-atts=\"to.atts\" v-formly-input-type=\"to.type\">\n</div>\n";
+	module.exports = "\n<div class=\"form-group formly-input\" :class=\"[ to.type, {'formly-has-value': model[field.key], 'formly-has-focus': form[field.key].$active}]\">\n  <label v-if=\"to.label\" :for=\"to.id ? to.id : null\">{{to.label}}</label>\n  <input class=\"form-control\" :class=\"to.classes\" :id=\"to.id ? to.id : null\" type=\"text\"  v-model=\"model[field.key]\" @blur=\"onBlur\" @focus=\"onFocus\" @click=\"onClick\" @change=\"onChange\" @keyup=\"onKeyup\" @keydown=\"onKeydown\" v-formly-atts=\"to.atts\" v-formly-input-type=\"to.inputType\">\n</div>\n";
 
 /***/ },
 /* 42 */

dist/vue-formly-bootstrap.min.js

@@ -1,6 +1,6 @@
 {
   "name": "vue-formly-bootstrap",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A bootstrap based form input bundle for Vue Formly",
   "main": "dist/vue-formly-bootstrap.js",
   "scripts": {

package.json

@@ -1,7 +1,7 @@
 <template>
   <div class="form-group formly-input" :class="[ to.type, {'formly-has-value': model[field.key], 'formly-has-focus': form[field.key].$active}]">
     <label v-if="to.label" :for="to.id ? to.id : null">{{to.label}}</label>
-    <input class="form-control" :class="to.classes" :id="to.id ? to.id : null" type="text"  v-model="model[field.key]" @blur="onBlur" @focus="onFocus" @click="onClick" @change="onChange" @keyup="onKeyup" @keydown="onKeydown" v-formly-atts="to.atts" v-formly-input-type="to.type">
+    <input class="form-control" :class="to.classes" :id="to.id ? to.id : null" type="text"  v-model="model[field.key]" @blur="onBlur" @focus="onFocus" @click="onClick" @change="onChange" @keyup="onKeyup" @keydown="onKeydown" v-formly-atts="to.atts" v-formly-input-type="to.inputType">
   </div>
 </template>
 

src/fields/fieldInput.vue

@@ -253,7 +253,7 @@ describe('Bootstrap Field Inputs', () => {
 
     it('supports other input types', () => {
       data.fields[0].type = 'input';
-      data.fields[0].templateOptions.type = 'password';
+      data.fields[0].templateOptions.inputType = 'password';
       createForm(data);
 
       let inputs = vm.$el.querySelectorAll('input');