Merge remote-tracking branch 'refs/remotes/origin/master' into form_name_attr

Author: icebob

dev/schema.js

@@ -220,6 +220,38 @@ module.exports = {
     model: "",
     styleClasses: "alert alert-info"
 },
+{
+    type: "radios",
+    label: "RADIOS",
+    model: "radios",
+    values: [
+		{name: "HTML5", value:"HTML5-123"},
+		{name: "Javascript", value:"Javascript-123"},
+		{name: "CSS3", value:"CSS3-123"},
+		{name: "CoffeeScript", value:"CoffeeScript-123"},
+		{name: "AngularJS", value:"AngularJS-123"},
+		{name: "ReactJS", value:"ReactJS-123"},
+		{name: "VueJS", value:"VueJS-123"}
+	],
+	radiosOptions: {
+		value:"value",
+		name:"name"
+	}
+},
+{
+    type: "radios",
+    label: "RADIOS2",
+    model: "radios2",
+    values: [
+		"HTML5",
+		"Javascript",
+		"CSS3",
+		"CoffeeScript",
+		"AngularJS",
+		"ReactJS",
+		"VueJS"
+	]
+},
 {
 	type: "image",
 	label: "Avatar (image field)",

package.json

@@ -39,20 +39,20 @@
   "author": "Icebob",
   "license": "MIT",
   "devDependencies": {
-    "babel-core": "6.13.2",
+    "babel-core": "6.14.0",
     "babel-loader": "6.2.5",
-    "babel-plugin-transform-runtime": "6.12.0",
-    "babel-preset-es2015": "6.13.2",
+    "babel-plugin-transform-runtime": "6.15.0",
+    "babel-preset-es2015": "6.14.0",
     "babel-preset-stage-0": "6.5.0",
     "chai": "3.5.0",
     "conventional-changelog-cli": "1.2.0",
     "conventional-github-releaser": "1.1.3",
-    "coveralls": "2.11.12",
-    "css-loader": "0.23.1",
-    "eslint": "3.3.1",
+    "coveralls": "2.11.14",
+    "css-loader": "0.25.0",
+    "eslint": "3.6.1",
     "eslint-friendly-formatter": "2.0.6",
     "eslint-loader": "1.5.0",
-    "eslint-plugin-html": "1.5.2",
+    "eslint-plugin-html": "1.5.3",
     "eslint-plugin-vue": "0.1.1",
     "extract-text-webpack-plugin": "1.0.1",
     "fakerator": "0.3.0",
@@ -62,41 +62,41 @@
     "isparta-loader": "2.0.0",
     "jade": "1.11.0",
     "jade-loader": "0.8.0",
-    "karma": "1.2.0",
+    "karma": "1.3.0",
     "karma-chai": "0.1.0",
     "karma-chrome-launcher": "1.0.1",
     "karma-coverage": "1.1.1",
     "karma-coveralls": "1.1.2",
-    "karma-mocha": "1.1.1",
-    "karma-phantomjs-launcher": "1.0.1",
-    "karma-sinon-chai": "1.2.3",
+    "karma-mocha": "1.2.0",
+    "karma-phantomjs-launcher": "1.0.2",
+    "karma-sinon-chai": "1.2.4",
     "karma-sourcemap-loader": "0.3.7",
     "karma-spec-reporter": "0.0.26",
     "karma-webpack": "1.8.0",
-    "lodash": "4.15.0",
+    "lodash": "4.16.2",
     "lolex": "1.5.1",
     "mocha": "2.5.3",
     "mocha-generators": "1.2.0",
     "mocha-loader": "0.7.1",
-    "moment": "2.14.1",
-    "node-sass": "3.8.0",
+    "moment": "2.15.1",
+    "node-sass": "3.10.0",
     "phantomjs-prebuilt": "2.1.12",
     "sass-loader": "3.2.0",
-    "sinon": "1.17.5",
+    "sinon": "1.17.6",
     "sinon-chai": "2.8.0",
     "stats-webpack-plugin": "0.4.2",
     "style-loader": "0.13.1",
     "vue-hot-reload-api": "1.3.2",
     "vue-html-loader": "1.2.3",
-    "vue-loader": "8.5.3",
+    "vue-loader": "8.5.4",
     "vue-style-loader": "1.0.0",
     "webpack": "1.13.2",
-    "webpack-dev-middleware": "1.6.1",
-    "webpack-dev-server": "1.15.0",
+    "webpack-dev-middleware": "1.8.3",
+    "webpack-dev-server": "1.16.1",
     "webpack-merge": "0.14.1"
   },
   "dependencies": {
     "babel-runtime": "6.11.6",
-    "vue": "1.0.26"
+    "vue": "1.0.27"
   }
 }

src/fields/abstractField.js

@@ -25,7 +25,6 @@ export default {
 			},
 
 			set(newValue) {
-
 				if (isFunction(this.formatValueToModel))
 					newValue = this.formatValueToModel(newValue);
 
@@ -40,7 +39,7 @@ export default {
 
 	watch: {
 		value: function(newVal, oldVal) {
-			//console.log("Changed", newVal, oldVal);
+			// console.log("Changed", newVal, oldVal);
 			if (isFunction(this.schema.onChanged)) {
 				this.schema.onChanged(this.model, newVal, oldVal, this.schema);
 			}

src/fields/fieldNoUiSlider.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="slider" :disabled="disabled" :class="{ 'contain-pips': typeof schema.noUiSliderOptions.pips !== 'undefined', 'contain-tooltip': schema.noUiSliderOptions.tooltips }"></div>  
+	<div class="slider" :disabled="disabled" :class="{ 'contain-pips': containPips, 'contain-tooltip': containTooltip }"></div>  
 </template>
 
 <script>
@@ -23,6 +23,15 @@
 			}
 		},
 
+		computed:{
+			containPips(){
+				return (this.schema.noUiSliderOptions && (typeof this.schema.noUiSliderOptions.pips) !== "undefined");
+			},
+			containTooltip(){
+				return (this.schema.noUiSliderOptions && this.schema.noUiSliderOptions.tooltips);
+			}
+		},
+
 		methods: {
 			onChange(value) {
 				if (isArray(value)) {
@@ -38,9 +47,8 @@
 					this.slider.noUiSlider.set(value);
 				}
 			},
-			formatValueToModel() {				
+			formatValueToModel(val) {				
 				if(typeof this.slider.noUiSlider !== "undefined"){
-					let val = this.slider.noUiSlider.get();
 					if (val instanceof Array) {
 						return [Number(val[0]), Number(val[1])];
 					}else{

src/fields/fieldRadios.vue

@@ -0,0 +1,78 @@
+<template lang="jade">
+	.radio-list(:disabled="disabled")
+		label(v-for="item in items")
+			input(type="radio", :disabled="disabled", :name="id", @click="onSelection(item)", :value="getItemValue(item)", :checked="isItemChecked(item)" )
+			| {{ getItemName(item) }}
+
+</template>
+
+<script>
+	import {isObject} from "lodash";
+	import abstractField from "./abstractField";
+	
+	export default {
+		mixins: [ abstractField ],
+
+		computed: {
+			items() {
+				let values = this.schema.values;
+				if (typeof(values) == "function") {
+					return values.apply(this, [this.model, this.schema]);
+				} else {
+					return values;
+				}
+			},
+			id(){
+				return this.schema.model;
+			}
+		},
+
+		methods: {
+			onSelection(item) {
+				if (isObject(item) && this.schema.radiosOptions.value && item[this.schema.radiosOptions.value]){
+					this.value = item[this.schema.radiosOptions.value];
+				} else{
+					this.value = item;
+				}
+			},
+			getItemValue(item) {
+				if (isObject(item) && this.schema.radiosOptions.value && item[this.schema.radiosOptions.value]){
+					return item[this.schema.radiosOptions.value];
+				}
+
+				return item;
+			},
+			getItemName(item) {
+				if (isObject(item) && this.schema.radiosOptions.name && item[this.schema.radiosOptions.name]){
+					return item[this.schema.radiosOptions.name];
+				}
+
+				return item;
+			},
+			isItemChecked(item) {
+				let currentValue;
+				if (isObject(item) && this.schema.radiosOptions.value && item[this.schema.radiosOptions.value]){
+					currentValue = item[this.schema.radiosOptions.value];
+				} else{
+					currentValue = item;
+				}
+				return (currentValue === this.value);
+			},
+		}
+	};
+</script>
+
+<style lang="sass">
+	.vue-form-generator .field-radios {
+
+		.radio-list {
+			label {
+				display: block;
+				input[type="radio"]{
+					margin-right: 5px;
+				}
+			}
+		}
+
+	}
+</style>

test/unit/specs/fields/fieldNoUiSlider.spec.js

@@ -55,11 +55,11 @@ describe("fieldNoUiSlider.vue", function() {
 		});
 
 		it("should contain the value", (done) => {
-			vm.$nextTick( () => {
+			setTimeout( () => {
 				let origin = input.querySelector(".noUi-origin");
 				expect(origin.style.left).to.be.within("70%", "90%");
 				done();
-			});
+			}, 100);
 		});
 
 		it("handle value should be the model value after changed", (done) => {
@@ -71,11 +71,10 @@ describe("fieldNoUiSlider.vue", function() {
 			}, 100);
 		});
 
-		it.skip("model value should be the handle value after changed", (done) => {
-			// `field.slider.noUiSlider.set(3);`	- It doesn't fired the onChange event
+		it("model value should be the handle value after changed", (done) => {
 			field.onChange(3);
 			setTimeout( () => {
-				expect(vm.model.rating).to.be.equal(3);
+				expect(field.model.rating).to.be.equal(3);
 				done();
 			}, 100);
 		});