Merge branch 'master-origin' into feature/468-unique-ids

* master-origin:
  migrated VFG docs to newer GitBooks, created GitHub Repo for Docs to allow for easier maintenance, updated JSFiddle to use "latest" VFG, and created a CodePen version as well
  Codacy (guard-for-in) fix
  fixed code structure
  added "options" to VFG install function, appending custom "validators" to the validators object that are passed into `Vue.use(VueFormGenerator, { validators: { key: (value, field, model) => {} })
  fixed single-quotes
  added "type" attribute to inside buttons schema, defaults to "button" when one is not provided
  added "item.disabled" logic, supporting both boolean values and a function that is passed a reference to the model to determine disabled logic based on the model.
  listen for model-updated from `fields`, and fix `debounceFormatFunction` property to match fieldInput's `debounceFormatFunc` instead.

# Conflicts:
#	src/fields/core/fieldRadios.vue

README.md

@@ -15,9 +15,10 @@ A schema-based form generator component for Vue.js.
 
 ## Demo
 
-[JSFiddle simple example](https://jsfiddle.net/icebob/0mg1v81e/)
+[JSFiddle simple example](https://jsfiddle.net/zoul0813/d8excp36/)
+[CodePen simple example](https://codepen.io/zoul0813/pen/OrNVNw)
 
-[![Screenshot](https://icebob.gitbooks.io/vueformgenerator/content/assets/vfg-example1.png)](https://jsfiddle.net/icebob/0mg1v81e/)
+[![Screenshot](https://github.com/vue-generators/vue-form-generator-docs/raw/master/assets/vfg-example1.png)](https://jsfiddle.net/zoul0813/d8excp36/)
 
 ## Features
 
@@ -33,7 +34,7 @@ A schema-based form generator component for Vue.js.
 
 ## Documentation
 
-[Online documentation on Gitbook](https://icebob.gitbooks.io/vueformgenerator/content/)
+[Online documentation on Gitbook](https://vue-generators.gitbook.io/vue-generators/)
 
 ## Dependencies
 
@@ -43,7 +44,7 @@ While built-in fields don't need external dependencies, optional fields may need
 These dependencies fall into two camps: jQuery or Vanilla. You can find almost the same functionality in both flavors.
 In the end, it's your choice to depend on jQuery or not.
 
-You can find details about dependencies in the official [documentation](https://icebob.gitbooks.io/vueformgenerator/content/) under each specific component.
+You can find details about dependencies in the official [documentation](https://vue-generators.gitbook.io/vue-generators/) under each specific component.
 
 ## Installation
 

src/fields/abstractField.js

@@ -31,7 +31,7 @@ export default {
 		return {
 			errors: [],
 			debouncedValidateFunc: null,
-			debouncedFormatFunction: null
+			debouncedFormatFunc: null
 		};
 	},
 

src/fields/core/fieldRadios.vue

@@ -1,13 +1,13 @@
 <template lang="pug">
 	.radio-list(:disabled="disabled", v-attributes="'wrapper'")
 		label(v-for="item in items", :class="{'is-checked': isItemChecked(item)}", v-attributes="'label'")
-			input(:id="getFieldID(schema, true)", type="radio", :disabled="disabled", :name="id", @click="onSelection(item)", :value="getItemValue(item)", :checked="isItemChecked(item)", :class="schema.fieldClasses", :required="schema.required", v-attributes="'input'")
+			input(:id="getFieldID(schema, true)", type="radio", :disabled="isItemDisabled(item)", :name="id", @click="onSelection(item)", :value="getItemValue(item)", :checked="isItemChecked(item)", :class="schema.fieldClasses", :required="schema.required", v-attributes="'input'")
 			| {{ getItemName(item) }}
 
 </template>
 
 <script>
-import { isObject } from "lodash";
+import { isObject, isFunction, get as objGet } from "lodash";
 import abstractField from "../abstractField";
 
 export default {
@@ -64,6 +64,16 @@ export default {
 		isItemChecked(item) {
 			let currentValue = this.getItemValue(item);
 			return currentValue === this.value;
+		},
+		isItemDisabled(item) {
+			if (this.disabled) {
+				return true;
+			}
+			let disabled = objGet(item, "disabled", false);
+			if (isFunction(disabled)) {
+				return disabled(this.model);
+			}
+			return disabled;
 		}
 	}
 };

src/formGenerator.vue

@@ -2,7 +2,7 @@
 div.vue-form-generator(v-if='schema != null')
 	fieldset(v-if="schema.fields", :is='tag')
 		template(v-for='field in fields')
-			form-group(v-if='fieldVisible(field)', :vfg="vfg", :field="field", :errors="errors", :model="model", :options="options", @validated="onFieldValidated")
+			form-group(v-if='fieldVisible(field)', :vfg="vfg", :field="field", :errors="errors", :model="model", :options="options", @validated="onFieldValidated", @model-updated="onModelUpdated")
 
 	template(v-for='group in groups')
 		fieldset(:is='tag', :class='getFieldRowClasses(group)')

src/formGroup.vue

@@ -11,7 +11,7 @@
 		<div class="field-wrap">
 			<component ref="child" :is="getFieldType(field)" :vfg="vfg" :disabled="fieldDisabled(field)" :model="model" :schema="field" :formOptions="options" @model-updated="onModelUpdated" @validated="onFieldValidated"></component>
 			<div v-if="buttonVisibility(field)" class="buttons">
-				<button v-for="(btn, index) in field.buttons" @click="buttonClickHandler(btn, field, $event)" :class="btn.classes" :key="index" v-text="btn.label"></button>
+				<button v-for="(btn, index) in field.buttons" @click="buttonClickHandler(btn, field, $event)" :class="btn.classes" :key="index" v-text="btn.label" :type="getButtonType(btn)"></button>
 			</div>
 		</div>
 
@@ -81,6 +81,10 @@ export default {
 		getFieldType(fieldSchema) {
 			return "field-" + fieldSchema.type;
 		},
+		// Get type of button, default to 'button'
+		getButtonType(btn) {
+			return objGet(btn, "type", "button");
+		},
 		// Child field executed validation
 		onFieldValidated(res, errors, field) {
 			this.$emit("validated", res, errors, field);

src/index.js

@@ -3,8 +3,15 @@ const schema = require("./utils/schema.js");
 const validators = require("./utils/validators.js").default;
 const fieldComponents = require("./utils/fieldsLoader").default;
 const abstractField = require("./fields/abstractField").default;
-const install = (Vue) => {
+const install = (Vue, options) => {
 	Vue.component("VueFormGenerator", module.exports.component);
+	if (options && options.validators) {
+		for (let key in options.validators) {
+			if ({}.hasOwnProperty.call(options.validators, key)) {
+				validators[key] = options.validators[key];
+			}
+		}
+	}
 };
 
 module.exports = {