small tweaks to 2.0.1

Author: matt-sanders

src/fields/fieldInput.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="form-group formly-input" :class="[ to.type, {'formly-has-value': model[field.key], 'formly-has-focus': form[field.key].$active}]">
+  <div class="form-group formly-input" :class="[ to.inputType, {'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.inputType">
   </div>
@@ -14,7 +14,7 @@
        
        this.$set(this.form[this.field.key], '$dirty', true);
        this.runFunction('onChange', e);
-       if ( this.to.type == 'file' ){
+       if ( this.to.inputType == 'file' ){
          this.$set(this.model, this.field.key, this.$el.querySelector('input').files);
        }
        

src/fields/fieldList.vue

@@ -2,8 +2,8 @@
   <div class="checkbox formly-list" :id="to.id" :class="to.classes">
 
     <label v-for="option in field.options">
-      <input v-if="!to.type || to.type == 'checkbox'" type="checkbox" v-model="model[field.key]" :value="option.value || option" @blur="onBlur" @focus="onFocus" @click="onClick" @change="onChange" @keyup="onKeyup" @keydown="onKeydown" v-formly-atts="to.atts">
-      <input v-if="to.type == 'radio'" type="radio" v-model="model[field.key]" :value="option.value || option" @blur="onBlur" @focus="onFocus" @click="onClick" @change="onChange" @keyup="onKeyup" @keydown="onKeydown" v-formly-atts="to.atts">
+      <input v-if="!to.inputType || to.inputType == 'checkbox'" type="checkbox" v-model="model[field.key]" :value="option.value || option" @blur="onBlur" @focus="onFocus" @click="onClick" @change="onChange" @keyup="onKeyup" @keydown="onKeydown" v-formly-atts="to.atts">
+      <input v-if="to.inputType == 'radio'" type="radio" v-model="model[field.key]" :value="option.value || option" @blur="onBlur" @focus="onFocus" @click="onClick" @change="onChange" @keyup="onKeyup" @keydown="onKeydown" v-formly-atts="to.atts">
       {{option.label || option}}
     </label>
 
@@ -16,7 +16,7 @@
      mixins: [baseField],
      created: function(){
          //set the default value to be an array if it's a checkbox
-         let type = this.to.type;
+         let type = this.to.inputType;
          if ( (!type || type == 'checkbox') && this.model[ this.field.key ] == '') this.$set(this.model, this.field.key, []);
      }
  }

test/unit/specs/index.spec.js

@@ -33,7 +33,7 @@ function trigger (target, event, process) {
 function describeFunctions(formlyElement, inputElement, inputType = 'text', options){
   beforeEach(() => {
     data.fields[0].type = formlyElement;
-    data.fields[0].templateOptions.type = inputType;
+    data.fields[0].templateOptions.inputType = inputType;
     if ( typeof options != 'undefined' ) data.fields[0].options = options;
     spy = sinon.spy();
   });
@@ -103,7 +103,7 @@ function describeFunctions(formlyElement, inputElement, inputType = 'text', opti
 function describeAttributes(inputElement, testPlaceholder = true){
   beforeEach(()=>{
     data.fields[0].type = inputElement;
-    data.fields[0].templateOptions.type = 'text';
+    data.fields[0].templateOptions.inputType = 'text';
   });
 
   it('attributes', () => {
@@ -142,7 +142,7 @@ function describeAttributes(inputElement, testPlaceholder = true){
 function describeConditional(inputElement){
   it('label', (done) => {
     data.fields[0].type = inputElement;
-    data.fields[0].templateOptions.type = 'text';
+    data.fields[0].templateOptions.inputType = 'text';
     data.fields[0].templateOptions.label = '';
     createForm(data);
 
@@ -187,7 +187,7 @@ describe('Bootstrap Field Inputs', () => {
       describeAttributes('input');
       it('should have input type as a class', () => {
         data.fields[0].type = 'input';
-        data.fields[0].templateOptions.type = 'text';
+        data.fields[0].templateOptions.inputType = 'text';
         createForm(data);
 
         let els = vm.$el.querySelectorAll('.text');
@@ -203,7 +203,7 @@ describe('Bootstrap Field Inputs', () => {
 
     it('layout', (done) => {
       data.fields[0].type = 'input';
-      data.fields[0].templateOptions.type = 'text';
+      data.fields[0].templateOptions.inputType = 'text';
       createForm(data);
 
       let inputs = vm.$el.querySelectorAll('input');
@@ -226,7 +226,7 @@ describe('Bootstrap Field Inputs', () => {
 
     it('adds active and focus classes', (done) => {
       data.fields[0].type = 'input';
-      data.fields[0].templateOptions.type = 'text';
+      data.fields[0].templateOptions.inputType = 'text';
       createForm(data);
 
       expect(vm.$el.querySelectorAll('.formly-has-focus')).to.be.length(0);
@@ -243,7 +243,7 @@ describe('Bootstrap Field Inputs', () => {
 
     it('defaults to text', () => {
       data.fields[0].type = 'input';
-      data.fields[0].templateOptions.type = undefined;
+      data.fields[0].templateOptions.inputType = undefined;
       createForm(data);
 
       let inputs = vm.$el.querySelectorAll('input');
@@ -363,7 +363,7 @@ describe('Bootstrap Field Inputs', () => {
 
     it('array options', () => {
       data.fields[0].type = 'list';
-      data.fields[0].templateOptions.type = 'checkbox';
+      data.fields[0].templateOptions.inputType = 'checkbox';
       data.fields[0].options = ['one', 'two', 'three'];
       createForm();
 
@@ -378,7 +378,7 @@ describe('Bootstrap Field Inputs', () => {
 
     it('object options', () => {
       data.fields[0].type = 'list';
-      data.fields[0].templateOptions.type = 'checkbox'
+      data.fields[0].templateOptions.inputType = 'checkbox'
       data.fields[0].options = [
         { label: 'Foo', value: 'bar' },
         { label: 'Bar', value: 'foo' }
@@ -418,7 +418,7 @@ describe('Bootstrap Field Inputs', () => {
 
     it('multiple values', (done) => {
       data.fields[0].type = 'list';
-      data.fields[0].templateOptions.type = 'checkbox';
+      data.fields[0].templateOptions.inputType = 'checkbox';
       data.fields[0].options = ['one', 'two'];
       createForm();
 
@@ -433,7 +433,7 @@ describe('Bootstrap Field Inputs', () => {
 
     it('single value', (done) => {
       data.fields[0].type = 'list';
-      data.fields[0].templateOptions.type = 'radio';
+      data.fields[0].templateOptions.inputType = 'radio';
       data.fields[0].options = ['one', 'two'];
       createForm();