Skip to content

Fixes bugs in ie11 #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/formulate.esm.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/formulate.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/formulate.umd.js

Large diffs are not rendered by default.

15 changes: 7 additions & 8 deletions src/FormulateInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -282,41 +282,40 @@ export default {
performValidation () {
const rules = parseRules(this.validation, this.$formulate.rules(this.parsedValidationRules))
this.pendingValidation = Promise.all(
rules.map(([rule, args]) => {
rules.map(([rule, args, ruleName]) => {
var res = rule({
value: this.context.model,
getFormValues: this.getFormValues.bind(this),
name: this.context.name
}, ...args)
res = (res instanceof Promise) ? res : Promise.resolve(res)
return res.then(res => res ? false : this.getValidationMessage(rule, args))
return res.then(res => res ? false : this.getMessage(ruleName, args))
})
)
.then(result => result.filter(result => result))
.then(errorMessages => { this.validationErrors = errorMessages })
return this.pendingValidation
},
getValidationMessage (rule, args) {
return this.getValidationFunction(rule)({
getMessage (ruleName, args) {
return this.getMessageFunc(ruleName)({
args,
name: this.mergedValidationName,
value: this.context.model,
vm: this,
formValues: this.getFormValues()
})
},
getValidationFunction (rule) {
let ruleName = rule.name.substr(0, 1) === '_' ? rule.name.substr(1) : rule.name
getMessageFunc (ruleName) {
ruleName = snakeToCamel(ruleName)
if (this.messages && typeof this.messages === 'object' && typeof this.messages[ruleName] !== 'undefined') {
if (this.messages && typeof this.messages[ruleName] !== 'undefined') {
switch (typeof this.messages[ruleName]) {
case 'function':
return this.messages[ruleName]
case 'string':
return () => this.messages[ruleName]
}
}
return (context) => this.$formulate.validationMessage(rule.name, context, this)
return (context) => this.$formulate.validationMessage(ruleName, context, this)
},
hasValidationErrors () {
return new Promise(resolve => {
Expand Down
16 changes: 15 additions & 1 deletion src/inputs/FormulateInputBox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,23 @@
:class="`formulate-input-element formulate-input-element--${context.type}`"
:data-type="context.type"
>
<!--
This explicit break out of types is due to a Vue bug that causes IE11 to
not when using v-model + dynamic :type + :value (thanks @Christoph-Wagner)
https://github.com/vuejs/vue/issues/8379
-->
<input
v-if="type === 'radio'"
v-model="context.model"
:type="type"
type="radio"
:value="context.value"
v-bind="attributes"
@blur="context.blurHandler"
>
<input
v-else
v-model="context.model"
type="checkbox"
:value="context.value"
v-bind="attributes"
@blur="context.blurHandler"
Expand Down
16 changes: 8 additions & 8 deletions src/libs/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,19 +106,19 @@ function parseRule (rule, rules) {
}
if (Array.isArray(rule) && rule.length) {
rule = rule.map(r => r) // light clone
rule[0] = snakeToCamel(rule[0])
if (typeof rule[0] === 'string' && rules.hasOwnProperty(rule[0])) {
return [rules[rule.shift()], rule]
const ruleName = snakeToCamel(rule.shift())
if (typeof ruleName === 'string' && rules.hasOwnProperty(ruleName)) {
return [rules[ruleName], rule, ruleName]
}
if (typeof rule[0] === 'function') {
return [rule.shift(), rule]
if (typeof ruleName === 'function') {
return [ruleName, rule, ruleName]
}
}
if (typeof rule === 'string') {
const segments = rule.split(':')
const functionName = snakeToCamel(segments.shift())
if (rules.hasOwnProperty(functionName)) {
return [rules[functionName], segments.length ? segments.join(':').split(',') : []]
const ruleName = snakeToCamel(segments.shift())
if (rules.hasOwnProperty(ruleName)) {
return [rules[ruleName], segments.length ? segments.join(':').split(',') : [], ruleName]
} else {
throw new Error(`Unknown validation rule ${rule}`)
}
Expand Down
19 changes: 12 additions & 7 deletions test/unit/utils.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import FileUpload from '@/FileUpload';
describe('parseRules', () => {
it('parses single string rules, returning empty arguments array', () => {
expect(parseRules('required', rules)).toEqual([
[rules.required, []]
[rules.required, [], 'required']
])
})

Expand All @@ -17,29 +17,29 @@ describe('parseRules', () => {

it('parses arguments for a rule', () => {
expect(parseRules('in:foo,bar', rules)).toEqual([
[rules.in, ['foo', 'bar']]
[rules.in, ['foo', 'bar'], 'in']
])
})

it('parses multiple string rules and arguments', () => {
expect(parseRules('required|in:foo,bar', rules)).toEqual([
[rules.required, []],
[rules.in, ['foo', 'bar']]
[rules.required, [], 'required'],
[rules.in, ['foo', 'bar'], 'in']
])
})

it('parses multiple array rules and arguments', () => {
expect(parseRules(['required', 'in:foo,bar'], rules)).toEqual([
[rules.required, []],
[rules.in, ['foo', 'bar']]
[rules.required, [], 'required'],
[rules.in, ['foo', 'bar'], 'in']
])
})

it('parses array rules with expression arguments', () => {
expect(parseRules([
['matches', /^abc/, '1234']
], rules)).toEqual([
[rules.matches, [/^abc/, '1234']]
[rules.matches, [/^abc/, '1234'], 'matches']
])
})
})
Expand Down Expand Up @@ -142,6 +142,11 @@ describe('snakeToCamel', () => {
it('has no effect hyphenated words', () => {
expect(snakeToCamel('not-a-good-name')).toBe('not-a-good-name')
})

it('returns the same function if passed', () => {
const fn = () => {}
expect(snakeToCamel(fn)).toBe(fn)
})
})


Expand Down