Skip to content

Commit 5830e85

Browse files
author
Lionel Bijaoui
committed
rename dateTime to dateTimePicker and slider to rangeSlider
1 parent fea94c1 commit 5830e85

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

dev/schema.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -390,13 +390,13 @@ module.exports = {
390390
validator: validators.required
391391
},
392392
{
393-
type: "slider",
393+
type: "rangeSlider",
394394
label: "Income",
395395
model: "income",
396396
multi: true,
397397
min: 0,
398398
max: 100000,
399-
sliderOptions: {
399+
rangeSliderOptions: {
400400
type: "double",
401401
prefix: "$",
402402
step: 1000
@@ -431,8 +431,8 @@ module.exports = {
431431
validator: validators.array
432432
},
433433
{
434-
type: "slider",
435-
label: "Rank (slider field)",
434+
type: "rangeSlider",
435+
label: "Rank (rangeSlider field)",
436436
model: "rank",
437437
multi: true,
438438
min: 1,
@@ -444,8 +444,8 @@ module.exports = {
444444
// validator: validators.integer
445445
},
446446
{
447-
type: "dateTime",
448-
label: "DOB (dateTime field)",
447+
type: "dateTimePicker",
448+
label: "DOB (dateTimePicker field)",
449449
model: "dob",
450450
required: true,
451451
placeholder: "User's birth of date",
@@ -462,7 +462,7 @@ module.exports = {
462462
}
463463
},
464464
{
465-
type: "dateTime",
465+
type: "dateTimePicker",
466466
label: "DT",
467467
model: "dob",
468468
multi: true,
@@ -474,7 +474,7 @@ module.exports = {
474474
}
475475
},
476476
{
477-
type: "dateTime",
477+
type: "dateTimePicker",
478478
label: "Time",
479479
model: "time",
480480
multi: true,
File renamed without changes.

src/fields/fieldSlider.vue renamed to src/fields/fieldRangeSlider.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
valueFrom = this.value;
4545
4646
let self = this;
47-
$(this.$el).ionRangeSlider(defaults(this.schema.sliderOptions || {}, {
47+
$(this.$el).ionRangeSlider(defaults(this.schema.rangeSliderOptions || {}, {
4848
type: "single",
4949
grid: true,
5050
hide_min_max: true,
@@ -73,7 +73,7 @@
7373

7474

7575
<style lang="sass">
76-
.vue-form-generator .field-slider .irs {
76+
.vue-form-generator .field-rangeSlider .irs {
7777
width: 100%;
7878
}
7979
</style>

test/unit/specs/fields/fieldDateTime.spec.js renamed to test/unit/specs/fields/fieldDateTimePicker.spec.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ import { createVueField, trigger, checkAttribute } from "../util";
33
import moment from "moment";
44

55
import Vue from "vue";
6-
import FieldDateTime from "src/fields/fieldDateTime.vue";
6+
import FieldDateTimePicker from "src/fields/fieldDateTimePicker.vue";
77

8-
Vue.component("FieldDateTime", FieldDateTime);
8+
Vue.component("FieldDateTimePicker", FieldDateTimePicker);
99

1010
let el, vm, field;
1111

1212
function createField(test, schema = {}, model = null, disabled = false, options) {
13-
[ el, vm, field ] = createVueField(test, "fieldDateTime", schema, model, disabled, options);
13+
[ el, vm, field ] = createVueField(test, "fieldDateTimePicker", schema, model, disabled, options);
1414
}
1515

16-
describe("fieldDateTime.vue", function() {
16+
describe("fieldDateTimePicker.vue", function() {
1717

1818
describe("check template", () => {
1919
let schema = {
20-
type: "dateTime",
20+
type: "dateTimePicker",
2121
label: "Event",
2222
model: "event",
2323
autocomplete: "off",
@@ -82,7 +82,7 @@ describe("fieldDateTime.vue", function() {
8282

8383
describe("check YYYYMMDD format", () => {
8484
let schema = {
85-
type: "dateTime",
85+
type: "dateTimePicker",
8686
label: "Event",
8787
model: "event",
8888
format: "YYYYMMDD",

test/unit/specs/fields/fieldSlider.spec.js renamed to test/unit/specs/fields/fieldRangeSlider.spec.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ import { expect } from "chai";
22
import { createVueField, checkAttribute } from "../util";
33

44
import Vue from "vue";
5-
import FieldSlider from "src/fields/fieldSlider.vue";
5+
import FieldRangeSlider from "src/fields/fieldRangeSlider.vue";
66

7-
Vue.component("FieldSlider", FieldSlider);
7+
Vue.component("FieldRangeSlider", FieldRangeSlider);
88

99
let el, vm, field;
1010

1111
function createField(test, schema = {}, model = null, disabled = false, options) {
12-
[ el, vm, field ] = createVueField(test, "fieldSlider", schema, model, disabled, options);
12+
[ el, vm, field ] = createVueField(test, "fieldRangeSlider", schema, model, disabled, options);
1313
}
1414

15-
describe("fieldSlider.vue", function() {
15+
describe("fieldRangeSlider.vue", function() {
1616

1717
describe("check template", () => {
1818
let schema = {
19-
type: "range",
19+
type: "rangeSlider",
2020
label: "Rating",
2121
model: "rating",
2222
min: 1,

0 commit comments

Comments
 (0)